From: terencehill <piuntn@gmail.com>
Date: Sun, 13 Mar 2016 13:13:44 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/translate_colors_2
X-Git-Tag: xonotic-v0.8.2~935^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0e847a336cdb7ab1fcb93d3cf3e1402b761a726;p=xonotic%2Fxonotic-data.pk3dir.git

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

e0e847a336cdb7ab1fcb93d3cf3e1402b761a726