From: Lyberta <lyberta@lyberta.net>
Date: Wed, 30 Aug 2017 03:55:07 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/URS2
X-Git-Tag: xonotic-v0.8.5~2488^2~3
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=bf31f77bddd7e794f2ba2525dec999a40169bc99;p=xonotic%2Fxonotic-data.pk3dir.git

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

bf31f77bddd7e794f2ba2525dec999a40169bc99