From: Jakob MG Date: Fri, 1 Jun 2012 20:10:43 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into tzork/csqc-items X-Git-Tag: xonotic-v0.7.0~312^2~35 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5113ce137473f7d4ffd4b085d79be93858aefece;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into tzork/csqc-items --- 5113ce137473f7d4ffd4b085d79be93858aefece