From: itsme <itsme.xonotic@ymail.com>
Date: Thu, 22 Aug 2013 09:56:52 +0000 (+0200)
Subject: Merge branch 'master' into itsme/tarx
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=373cc4def8a528b7a1d1bc3a5af0cc52c45f307a;p=xonotic%2Fxonotic-maps.pk3dir.git

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

373cc4def8a528b7a1d1bc3a5af0cc52c45f307a