From: Lyberta <lyberta@lyberta.net>
Date: Thu, 17 May 2018 08:42:02 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PrintMove
X-Git-Tag: xonotic-v0.8.5~2074^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c25812c4057b439a7e4fbf756c95378eca3bd187;p=xonotic%2Fxonotic-data.pk3dir.git

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

c25812c4057b439a7e4fbf756c95378eca3bd187