From: Mario <mario@smbclan.net>
Date: Thu, 10 Nov 2016 16:05:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~34
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=05c1916e1f78c8233a0eb88b5f619d31ac5c9569;hp=05c1916e1f78c8233a0eb88b5f619d31ac5c9569

Merge branch 'master' into Mario/wepent_experimental
---