From: Mario <mario@smbclan.net>
Date: Mon, 13 Jun 2016 09:22:03 +0000 (+1000)
Subject: Merge branch 'master' into Mario/fullbright_skins
X-Git-Tag: xonotic-v0.8.2~804^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/fullbright_skins
---

3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc