From: Mario <zacjardine@y7mail.com>
Date: Wed, 4 Jan 2017 07:07:41 +0000 (+0000)
Subject: Merge branch 'Mario/wepent_experimental' into 'master'
X-Git-Tag: xonotic-v0.8.2~326
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36ba1021949ebd475e0561237a17ecf9fb93ced8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/wepent_experimental' into 'master'

Merge branch Mario/wepent_experimental (XXL merge request)

See merge request !372
---

36ba1021949ebd475e0561237a17ecf9fb93ced8