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)
commite4ae59234c87e77f95714462adae370790c6d5e6
treeba9357901192969680afdb6069be419a38eda1e0
parent03a7fb4f25191e6bcb64bc953572aaf7f5958b19
parent2f777a8f0919b918d8f72b26c21a29423b2040e9
Merge branch 'initial-sone-discovery' into next

This resolves #251.