From: Lyberta <lyberta@lyberta.net>
Date: Sat, 25 Nov 2017 00:34:52 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2d5f6090a4faee9716a9c149b9ac6927cc3bb9db

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

2d5f6090a4faee9716a9c149b9ac6927cc3bb9db