From: Mirio <opivy@hotmail.de>
Date: Tue, 5 May 2015 12:19:27 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63e28002c6b92df2eff83d79a84701db968eba3b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

63e28002c6b92df2eff83d79a84701db968eba3b