From: Mario <zacjardine@y7mail.com>
Date: Thu, 31 Mar 2016 06:06:37 +0000 (+0000)
Subject: Merge branch 'terencehill/warmup_limit_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~980
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c49dd6c6d9a902750901a7834930d91f1c4dadad;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/warmup_limit_fix' into 'master'

Warmup limit fix



See merge request !301
---

c49dd6c6d9a902750901a7834930d91f1c4dadad