From: Lyberta <lyberta@lyberta.net>
Date: Sun, 2 Apr 2017 16:01:59 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/DebugPrintToChat
X-Git-Tag: xonotic-v0.8.5~2842^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=343a058d7b1c5e28dda77ab5c6493a367400876e;p=xonotic%2Fxonotic-data.pk3dir.git

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

343a058d7b1c5e28dda77ab5c6493a367400876e