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

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

62a0942df8fa70fdeb9ae7050e6d37e4bb81e251