From: terencehill Date: Mon, 30 Jan 2017 10:44:23 +0000 (+0100) Subject: Merge branch 'master' into terencehill/bot_item_rating X-Git-Tag: xonotic-v0.8.2~202^2~24 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e2e3f299aa767d90e93eab4815ea6acafa7b956;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/bot_item_rating --- 0e2e3f299aa767d90e93eab4815ea6acafa7b956