From: Rudolf Polzer Date: Thu, 22 Dec 2011 09:01:16 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~79 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a50d76ee500698d2ee6794ab9ea3084276cc1bed;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir --- a50d76ee500698d2ee6794ab9ea3084276cc1bed