From: Lyberta <lyberta@lyberta.net>
Date: Sun, 10 Sep 2017 23:39:30 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/DynamicHandicap
X-Git-Tag: xonotic-v0.8.5~2474^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a178ce04d0e69fccb80466c7fdb6913676dbfca7;p=xonotic%2Fxonotic-data.pk3dir.git

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

a178ce04d0e69fccb80466c7fdb6913676dbfca7