From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 6 Apr 2013 16:39:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.0.0~209
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=f52f37b4792a117821b2aab6a4213e30996a28b3;hp=-c

Merge remote-tracking branch 'origin/master'
---

f52f37b4792a117821b2aab6a4213e30996a28b3