From: Mirio <opivy@hotmail.de>
Date: Mon, 31 Aug 2015 11:58:51 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/atomforge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84a83093d2e5337610f34cb549165fb3ad7aeb1c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

84a83093d2e5337610f34cb549165fb3ad7aeb1c