Merge branch 'keys-from-wot' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Thu, 20 Sep 2012 15:13:30 +0000 (17:13 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Thu, 20 Sep 2012 15:13:30 +0000 (17:13 +0200)
commite00f3d069490144830f5eaa3c0d6d755e2517855
tree5fbadd2a284d815b613b3ae8113b9107c12bc7fc
parente06fc7d961d51a38917737d86804b7608bd7a711
parent834f9e2aa7192211bdf0e4b51c70686c0a69e033
Merge branch 'keys-from-wot' into next

This resolves #285.