Merge branch 'master' into terencehill/insta_notifications
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:29:48 +0000 (16:29 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:29:48 +0000 (16:29 +1100)
commitdc891780036706390bcaa27975dcb71e499deeae
tree4ec7e0bf73c9108880b324088891d895a2628834
parent083132643679f9fa1c85b232929685461f4a15df
parent935f38b6d41fb6e2579a4ee1e7c6fb0d063e5869
Merge branch 'master' into terencehill/insta_notifications

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc