From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 14 Jul 2011 08:55:04 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-lightspeed
X-Git-Tag: xonotic-v0.6.0~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6d605645f0f6b9240193244d35cf8419dca7543;p=xonotic%2Fxonotic-maps.pk3dir.git

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

f6d605645f0f6b9240193244d35cf8419dca7543