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

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

e1037e3f7f3073ba99aa4f8ac0dd103ad297d360