From: Jan Behrens <zykure@web.de>
Date: Thu, 31 Jan 2013 17:40:52 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~23^2~12
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=ae715b8874b92feeadbe09e5dd569d0ff6e3d48a;hp=9c135628c252c5655c452c7143e14461391c7799;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---