From: cbrutail <ruszkai.akos@gmail.com>
Date: Sat, 5 Nov 2011 23:39:03 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/map-8bit_arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1e85ece7c4fb056dfb68f357262a491d1c3ea0f;p=xonotic%2Fxonotic-maps.pk3dir.git

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

b1e85ece7c4fb056dfb68f357262a491d1c3ea0f