From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Apr 2020 12:28:53 +0000 (+0200)
Subject: Merge branch 'martin-t/limit'
X-Git-Tag: xonotic-v0.8.5~1133
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=caa42d15f2b2cd3ed4bc177a9aa70903e67d5142;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/limit'
---

caa42d15f2b2cd3ed4bc177a9aa70903e67d5142