From: terencehill <piuntn@gmail.com>
Date: Thu, 3 Nov 2016 18:58:13 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/gameover_stuff
X-Git-Tag: xonotic-v0.8.2~389^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f08a117d2eada0c38cb1d07a0798daf192dd666;p=xonotic%2Fxonotic-data.pk3dir.git

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

8f08a117d2eada0c38cb1d07a0798daf192dd666