From: terencehill <piuntn@gmail.com>
Date: Wed, 5 Sep 2018 19:26:57 +0000 (+0200)
Subject: Merge branch 'terencehill/wpeditior_command'
X-Git-Tag: xonotic-v0.8.5~1906
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9215008d87f1170da32befded6baeb55f3a2cf13;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/wpeditior_command'
---

9215008d87f1170da32befded6baeb55f3a2cf13