From: cbrutail <ruszkai.akos@gmail.com>
Date: Mon, 1 Nov 2010 14:32:14 +0000 (+0100)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrut... 
X-Git-Tag: xonotic-v0.6.0~115
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16b9504ddb857490a3e0407cbe797c89a04c1007;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/map-lightspeed
---

16b9504ddb857490a3e0407cbe797c89a04c1007