From: Lyberta <lyberta@lyberta.net>
Date: Fri, 17 Mar 2017 20:15:24 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3e0e567fa428d7016db433260753e02e182aaf1;p=xonotic%2Fxonotic-data.pk3dir.git

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

b3e0e567fa428d7016db433260753e02e182aaf1