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

Merge branch 'cbrutail/warpzone-green' into cbrutail/map-8bit_arena
---

d3b7480dc94165debc97e4b93b2dc572ed2dad15