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)
commiteb2518b5354c300fa697051530900ce50bdb2bc1
tree47169937ff0c371ba03cd877af10f4c6362f898a
parentcf1e9ff0af9a588d0ca462047975327e5fc3aef0
parentd598635bbc779b2d8e4f247f2b3c30e18d1b4d9f
Merge remote-tracking branch 'origin/samual/notifications'