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)
commit8b576ec955d0c3a7d6e57326438b532afe40aa0f
treeaf00f8254a1474373488b7a48b2e2f24f577828f
parent12ef4ab5bf492dd3d50ebfa66d662d1e98f430a2
parentcf58e5c2605f469be3f1b564bee1386f096495c5
Merge branch 'notifications' into next

This resolves #254.