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

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

292b040dad7495caad3b60990de990fd3e196cf2