From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 2 Jun 2011 21:43:38 +0000 (+0200)
Subject: Merge branch 'master' into cbrutail/map-lightspeed
X-Git-Tag: xonotic-v0.6.0~108
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=a792b4ada65da1387e7789646d4f08daeb2c03a6;p=xonotic%2Fxonotic-maps.pk3dir.git

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

a792b4ada65da1387e7789646d4f08daeb2c03a6