From: terencehill <piuntn@gmail.com>
Date: Sun, 1 May 2016 10:48:52 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/translate_colors_2
X-Git-Tag: xonotic-v0.8.2~935^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F290%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

bf28c62f9ad2f130024109354c2503457195898d