From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 3 Nov 2010 18:41:11 +0000 (+0100)
Subject: Merge branch 'master' into tzork/nexballarena
X-Git-Tag: xonotic-v0.1.0preview~42^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ec6a6a10dfaa18e8d8701c0554bb1dae515386d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into tzork/nexballarena
---

7ec6a6a10dfaa18e8d8701c0554bb1dae515386d