From: Mirio <opivy@hotmail.de>
Date: Tue, 10 Feb 2015 00:07:15 +0000 (+0100)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dada14113b6d34a1c2c6526d50b58fe8ef9c591e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

dada14113b6d34a1c2c6526d50b58fe8ef9c591e