From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 25 Sep 2013 17:51:37 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-breath
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=680f308ac4aee142a35642ba46ada7e63792c4e0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-breath

Merging master into my work branch of Debugger's Breath map.
---

680f308ac4aee142a35642ba46ada7e63792c4e0