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

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

600fa247f56b4a0d984c8b77e1578a11c54ce208