From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 29 Dec 2011 11:42:57 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/stormkeep-sRGB
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9547e4b3115d972b4b9bba87473112ddd82204a3;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/stormkeep-sRGB
---

9547e4b3115d972b4b9bba87473112ddd82204a3