Merge branch 'master' of /srv/git.sesse.net/www/cubemap
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 10 Jul 2015 21:46:37 +0000 (23:46 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 10 Jul 2015 21:46:37 +0000 (23:46 +0200)

Trivial merge