From: Lyberta <lyberta@lyberta.net>
Date: Wed, 2 May 2018 09:03:22 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PrintMove
X-Git-Tag: xonotic-v0.8.5~2074^2~7
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=be1aeb5b7ce833a6f6f9da0c4c00ba99f2dea7b8

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

be1aeb5b7ce833a6f6f9da0c4c00ba99f2dea7b8