From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 13 Jul 2013 09:24:52 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/lightspeed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e1a731892babace559935e1d54115ac8885d4b2;p=xonotic%2Fxonotic-maps.pk3dir.git

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

5e1a731892babace559935e1d54115ac8885d4b2