From: terencehill <piuntn@gmail.com>
Date: Mon, 26 Sep 2016 15:04:42 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/overkill_stuff
X-Git-Tag: xonotic-v0.8.2~553^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b20d0cb8846118d9cfd5031ef8ecf5c2b4256c0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/overkill_stuff
---

4b20d0cb8846118d9cfd5031ef8ecf5c2b4256c0