From: Lyberta <lyberta@lyberta.net>
Date: Wed, 6 Sep 2017 11:44:09 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/DynamicHandicap
X-Git-Tag: xonotic-v0.8.5~2474^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77acc848d2d308331349c2d86480b74f5029fcd1;p=xonotic%2Fxonotic-data.pk3dir.git

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

77acc848d2d308331349c2d86480b74f5029fcd1