From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 5 Oct 2011 13:48:10 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d54b44f7f368713f5d51b979ed697a6840996a03;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-arena
---

d54b44f7f368713f5d51b979ed697a6840996a03