From: Mario <mario@smbclan.net>
Date: Fri, 19 Aug 2016 02:08:33 +0000 (+1000)
Subject: Merge branch 'Mario/user_movetypes'
X-Git-Tag: xonotic-v0.8.2~700
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07916e211d8f8e49f9eb09ed800dd7f22b9eedb3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/user_movetypes'
---

07916e211d8f8e49f9eb09ed800dd7f22b9eedb3