From: terencehill <piuntn@gmail.com>
Date: Fri, 16 Sep 2016 14:27:50 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/gameover_stuff
X-Git-Tag: xonotic-v0.8.2~389^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67c148c785f03d94ae1a4085dc5feed30028c0b7;p=xonotic%2Fxonotic-data.pk3dir.git

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

67c148c785f03d94ae1a4085dc5feed30028c0b7