From: Rudolf Polzer Date: Tue, 31 Jan 2012 19:48:23 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~12 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=39c5a2ddb560b76d6134ee27da5096eb784eac25 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 39c5a2ddb560b76d6134ee27da5096eb784eac25