From: Mario <zacjardine@y7mail.com>
Date: Sat, 15 Aug 2015 21:04:18 +0000 (+1000)
Subject: Merge branch 'maint' of https://gitlab.com/xonotic/xonotic-data.pk3dir into maint
X-Git-Tag: xonotic-v0.8.1~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce0f3dfc0fe27803814a32619a6357ad4914f54a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'maint' of https://gitlab.com/xonotic/xonotic-data.pk3dir into maint
---

ce0f3dfc0fe27803814a32619a6357ad4914f54a