From: terencehill <piuntn@gmail.com>
Date: Wed, 20 Sep 2017 18:11:22 +0000 (+0000)
Subject: Merge branch 'martin-t/votefix' into 'master'
X-Git-Tag: xonotic-v0.8.5~2463
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9b0bea7bd92dc8977654da12740e07a0509f412e;p=xonotic%2Fxonotic-data.pk3dir.git

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

Fix vote timing out when none is called

See merge request xonotic/xonotic-data.pk3dir!492
---

9b0bea7bd92dc8977654da12740e07a0509f412e