From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Thu, 20 Sep 2012 15:13:30 +0000 (+0200)
Subject: Merge branch 'keys-from-wot' into next
X-Git-Tag: 0.11^2~10
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e00f3d069490144830f5eaa3c0d6d755e2517855;p=jSite.git

Merge branch 'keys-from-wot' into next

This resolves #285.
---

e00f3d069490144830f5eaa3c0d6d755e2517855