Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Fri, 28 Dec 2012 00:23:34 +0000 (19:23 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 28 Dec 2012 00:23:34 +0000 (19:23 -0500)

Trivial merge