From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 13 Mar 2017 23:01:55 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/overkill
X-Git-Tag: xonotic-v0.8.2~49^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2bc5f6a930cee3d99d71c2602bc8e13db4bead06;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/overkill
---

2bc5f6a930cee3d99d71c2602bc8e13db4bead06