From: Debugger <pyngot@hotmail.com>
Date: Wed, 25 Sep 2013 18:31:57 +0000 (+0200)
Subject: Merge branch 'master' into debugger/aurora_ctf
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6eb6b9cc038132da5f3e1d05e4a2cdec186e9bc6;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into debugger/aurora_ctf
---

6eb6b9cc038132da5f3e1d05e4a2cdec186e9bc6