From: Mario <mario@smbclan.net>
Date: Mon, 17 Oct 2016 13:43:14 +0000 (+1000)
Subject: Merge branch 'master' into terencehill/gameover_stuff
X-Git-Tag: xonotic-v0.8.2~389^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=922354d1191d534b0b12516e28561bc70cbe2a87;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/gameover_stuff

# Conflicts:
#	notifications.cfg
---

922354d1191d534b0b12516e28561bc70cbe2a87