From: Mirio <opivy@hotmail.de>
Date: Tue, 27 Oct 2015 10:10:13 +0000 (+0100)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d6b0adab94a984200c9e087831fe0f85c76646c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into kuniuthefrogg/atomforge
---

8d6b0adab94a984200c9e087831fe0f85c76646c