From: terencehill <piuntn@gmail.com>
Date: Fri, 20 Jan 2017 15:50:01 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_item_rating
X-Git-Tag: xonotic-v0.8.2~202^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c97577a92244e0c02e0f4319426542dfdcc5a42;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_item_rating
---

6c97577a92244e0c02e0f4319426542dfdcc5a42