From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 9 Jun 2013 07:20:35 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/lightspeed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be31201bbf763bd61a3bb8f452c6d2865d4b8ef3;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/lightspeed
---

be31201bbf763bd61a3bb8f452c6d2865d4b8ef3