From: Mario <mario@smbclan.net>
Date: Sat, 24 Dec 2016 20:40:59 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~15
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=bd84ca6fa3aa22e2100db210e7a4d7de8442d71f

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

bd84ca6fa3aa22e2100db210e7a4d7de8442d71f