From: Mario <mario@smbclan.net>
Date: Sun, 27 Mar 2016 05:14:45 +0000 (+1000)
Subject: Merge branch 'Mario/warpzone_self'
X-Git-Tag: xonotic-v0.8.2~999
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00f6072f2b0f269b2bc63a62ad900515646ca30d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/warpzone_self'
---

00f6072f2b0f269b2bc63a62ad900515646ca30d