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

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

7579dfa9573f9964e29e52e1aac1dec05e4f77a4