From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Apr 2015 23:33:44 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4866c7dab66faca2d86bc4146bae2dbe6a58e86c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

4866c7dab66faca2d86bc4146bae2dbe6a58e86c