From: cbrutail <ruszkai.akos@gmail.com>
Date: Tue, 10 Sep 2013 20:52:37 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-confusor
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba443f49e0b0d6da9cee3266d78d7eaf0ef94c97;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-confusor

mergy mergy, maybe worky worky
---

ba443f49e0b0d6da9cee3266d78d7eaf0ef94c97