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

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

b8ec244f8527cc75b916224c9fc49ba6218c5c27