From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 13 Apr 2013 20:53:23 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.sesse.net/srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~118
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=93bcb482a3f433504aa794441ea4a69aede345ff;hp=-c

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

93bcb482a3f433504aa794441ea4a69aede345ff