From: terencehill <piuntn@gmail.com>
Date: Tue, 13 Sep 2016 20:56:35 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/gameover_stuff
X-Git-Tag: xonotic-v0.8.2~389^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff024dad9985f1adf868547dbbcefdcaadbe9d1c;p=xonotic%2Fxonotic-data.pk3dir.git

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

ff024dad9985f1adf868547dbbcefdcaadbe9d1c