From: Mario <mario@smbclan.net>
Date: Tue, 8 Nov 2016 03:37:22 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/func_train_random_target
X-Git-Tag: xonotic-v0.8.2~457^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5352a65c86ae185b0ff5c412d1eb1208912c17ab;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/func_train_random_target
---

5352a65c86ae185b0ff5c412d1eb1208912c17ab