From: terencehill <piuntn@gmail.com>
Date: Wed, 30 May 2018 12:44:23 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/min_spec_time
X-Git-Tag: xonotic-v0.8.5~2067^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210;p=xonotic%2Fxonotic-data.pk3dir.git

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

bc50c2d7ca3e0a44ed1712400ef8e170e6df8210