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

Merge branch 'maint' (early part)
---

0a6d4cd16b83990beff55c8b7850a492da8864e2