Merge branch 'notification-for-locked-sones' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 13 Dec 2010 19:28:06 +0000 (20:28 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 13 Dec 2010 19:28:06 +0000 (20:28 +0100)

Trivial merge