Merge branch 'master' of /srv/git.sesse.net/www/cubemap
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 8 May 2013 18:45:46 +0000 (20:45 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 8 May 2013 18:45:46 +0000 (20:45 +0200)

Trivial merge