From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 10 Apr 2013 21:36:59 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~158
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=ac50b1104f5f525e838f80fa6dc50be13f7d35b6;ds=sidebyside

Merge branch 'master' of /srv/git.sesse.net/www/cubemap
---

ac50b1104f5f525e838f80fa6dc50be13f7d35b6