From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Nov 2014 00:33:53 +0000 (+1100)
Subject: Merge branch 'terencehill/notification_cvars'
X-Git-Tag: xonotic-v0.8.0~132
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06953d7d1a40e2ee6dd389ae50b20ef9c7f75557;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/notification_cvars'

Conflicts:
	notifications.cfg
---

06953d7d1a40e2ee6dd389ae50b20ef9c7f75557