Merge branch 'terencehill/notification_cvars'
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:33:53 +0000 (11:33 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:33:53 +0000 (11:33 +1100)
Conflicts:
notifications.cfg

1  2 
qcsrc/common/notifications.qc

Simple merge