From: Mario <mario@smbclan.net>
Date: Sun, 12 Jun 2016 18:19:25 +0000 (+1000)
Subject: Merge branch 'master' into Mario/entrap_nade
X-Git-Tag: xonotic-v0.8.2~807^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2bda4ac404ae8e0e58bb5371d9d1f62196e8d1e;p=xonotic%2Fxonotic-data.pk3dir.git

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

d2bda4ac404ae8e0e58bb5371d9d1f62196e8d1e