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

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

23ada95ee7bc58d9f4f225c830dadd19000ec8c3