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

Merge branch 'maint'
---

0b7855b8e65e0220238a08cdcdd2ca7386e3d06e