From: Mirio <opivy@hotmail.de>
Date: Thu, 20 Aug 2015 07:05:38 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e770509416600495fc1ccaf985fd12cadd0cb77;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8e770509416600495fc1ccaf985fd12cadd0cb77