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

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

bfa8b1ccda6dde715dcf474228000540dcb2e5a1