Merge branch 'master' of /srv/git.sesse.net/www/cubemap
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 15 Apr 2013 21:27:58 +0000 (23:27 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 15 Apr 2013 21:27:58 +0000 (23:27 +0200)

Trivial merge