From: cbrutail <ruszkai.akos@gmail.com>
Date: Sun, 12 Jun 2011 18:15:56 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-lightspeed
X-Git-Tag: xonotic-v0.6.0~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=caf2b82b14f4be7d197aacfe4072eaaf9c6e0d84;p=xonotic%2Fxonotic-maps.pk3dir.git

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

caf2b82b14f4be7d197aacfe4072eaaf9c6e0d84