Merge branch 'initial-sone-discovery' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 13 Nov 2011 12:08:26 +0000 (13:08 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 13 Nov 2011 12:08:28 +0000 (13:08 +0100)
This resolves #251.


Trivial merge