Merge remote-tracking branch 'origin/samual/notifications'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)

Trivial merge