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

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

f7ae3afc2f84e55cea8b15d3cea11da2ab115a04