From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Jul 2015 15:32:59 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3cc3986e7d5c09d4ea5cc0dc53a18aceb0148809;p=xonotic%2Fxonotic-maps.pk3dir.git

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

3cc3986e7d5c09d4ea5cc0dc53a18aceb0148809