Merge branch 'notifications' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Nov 2011 06:50:06 +0000 (07:50 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Nov 2011 06:50:09 +0000 (07:50 +0100)
This resolves #254.


Trivial merge