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

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

c6a848b754ba24dbd76ee3c44341a2cb5a0258a9