From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 17 Sep 2013 15:04:38 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/xoylent_ctf
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmatthiaskrgr%2Fxoylent_ctf;p=xonotic%2Fxonotic-maps.pk3dir.git

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

db1d6a3d879fc91a11e7fc4f4b07e9e4c89d3bbe