From: Mario <mario@smbclan.net>
Date: Tue, 14 Jun 2016 12:58:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/entrap_nade
X-Git-Tag: xonotic-v0.8.2~807^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F324%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

6a611fb362129440369cb09a590023d6292102e9