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

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

a655526219ed68a7fce68934a68953bcd01d125e