From: terencehill <piuntn@gmail.com>
Date: Sun, 27 Nov 2016 23:23:32 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/LMS_improvements
X-Git-Tag: xonotic-v0.8.2~404^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2046c0aa48fa58594d075ca4247a7dd724ae9bfb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/LMS_improvements
---

2046c0aa48fa58594d075ca4247a7dd724ae9bfb