From: terencehill <piuntn@gmail.com>
Date: Fri, 6 Apr 2018 19:44:53 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/min_spec_time
X-Git-Tag: xonotic-v0.8.5~2067^2~3
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d01c567581179df7cc68bcdc8dce58efad911bc4

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

d01c567581179df7cc68bcdc8dce58efad911bc4