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

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

3f3a9c045591a708df9c8bb47d5f3ddcaf4658ca