From: Mario <mario@smbclan.net>
Date: Mon, 24 Oct 2016 17:47:15 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=646e82672a7a8b8db0be0caf5dbd062b0d04da96;p=xonotic%2Fxonotic-data.pk3dir.git

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

646e82672a7a8b8db0be0caf5dbd062b0d04da96