From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 17 May 2012 21:44:58 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-8bit_arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=260fa32c313a40654cf404e52b2c828e7330818e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

Wtf, master merge needs commit? oO
---

260fa32c313a40654cf404e52b2c828e7330818e