From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 18 May 2011 15:56:23 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-lightspeed
X-Git-Tag: xonotic-v0.6.0~112
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=e8ad846bfb58ce88176766d032b2fe2bf7e59551

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

e8ad846bfb58ce88176766d032b2fe2bf7e59551