From: Lyberta <lyberta@lyberta.net>
Date: Sat, 3 Jun 2017 13:17:18 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c49aafeeeed3cf8af211b8e02ee29a99cbcdf5e;p=xonotic%2Fxonotic-data.pk3dir.git

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

2c49aafeeeed3cf8af211b8e02ee29a99cbcdf5e