From: cbrutail <ruszkai.akos@gmail.com>
Date: Fri, 28 Oct 2011 06:04:46 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-lightspeed
X-Git-Tag: xonotic-v0.6.0~72
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=797a1799e348e38e1adba2217cbb55ac6e970c55;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into cbrutail/map-lightspeed
---

797a1799e348e38e1adba2217cbb55ac6e970c55