From: ItsMe <itsme.xonotic@ymail.com>
Date: Thu, 20 Jun 2013 07:37:25 +0000 (+0200)
Subject: Merge branch 'xonotic-maps.pk3dir/itsme/vorix' of git://git.xonotic.org/xonotic/oldst... 
X-Git-Tag: xonotic-v0.8.0~14^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64dfca1403579e33df5d1b3c31f7b6c1d2395f83;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'xonotic-maps.pk3dir/itsme/vorix' of git://git.xonotic.org/xonotic/oldstuff into itsme/vorix
---

64dfca1403579e33df5d1b3c31f7b6c1d2395f83