From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 28 Oct 2016 18:58:49 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/msnt
X-Git-Tag: xonotic-v0.8.2~456^2~10
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=e1bfe1d1d43ac7adedba945d692b37e0aafc453b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/msnt
---

e1bfe1d1d43ac7adedba945d692b37e0aafc453b