From: itsme <itsme.xonotic@ymail.com>
Date: Mon, 1 Jul 2013 23:33:24 +0000 (+0200)
Subject: Merge branch 'master' into itsme/tarx
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aec312952b5ff06b0015a7cc3c481fc11cefce15;p=xonotic%2Fxonotic-maps.pk3dir.git

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

aec312952b5ff06b0015a7cc3c481fc11cefce15