From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:39:45 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GiveResourceWithLimit
X-Git-Tag: xonotic-v0.8.5~2204^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cac7a0ffc2bb7212fdd92f5c9782b09b65279fe1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/GiveResourceWithLimit
---

cac7a0ffc2bb7212fdd92f5c9782b09b65279fe1