Merge remote-tracking branch 'refs/remotes/rodney757/notifications'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Aug 2013 21:00:48 +0000 (16:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Aug 2013 21:00:48 +0000 (16:00 -0500)

Trivial merge