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

Trivial merge