From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 10 Jul 2015 21:46:37 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.2.0~23
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=0e96bbf9ee0fbebd5fe3fba4d186c0e0d73c9a32;hp=0e96bbf9ee0fbebd5fe3fba4d186c0e0d73c9a32

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