From: cbrutail <ruszkai.akos@gmail.com>
Date: Sun, 23 Oct 2011 16:27:06 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-8bit_arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7f62617c3912fff42dbc9857cb11371ceb5a422;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-8bit_arena
---

b7f62617c3912fff42dbc9857cb11371ceb5a422