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

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

d271f27a5ac351a3a7b39636932f6d661492be1d