From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 20 Aug 2015 17:19:07 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: xonotic-v0.8.2~2066
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17f8cdecf39482eca4a49623d67bfdb5f4477d29;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'maint'
---

17f8cdecf39482eca4a49623d67bfdb5f4477d29