From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 15 Apr 2013 10:20:37 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~106
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=1ee15e02f30010292a92aad0f0dda15c6b418c7d

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

1ee15e02f30010292a92aad0f0dda15c6b418c7d