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

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

51ad94a7427eb1633c8b5305631c829f907818e9