From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Mar 2011 17:37:27 +0000 (+0200)
Subject: Merge branch 'new-web-of-trust' into next
X-Git-Tag: 0.5.2^2~1
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c3745c94d79e6fba53c95003287f539b79b2e749;p=Sone.git

Merge branch 'new-web-of-trust' into next
---

c3745c94d79e6fba53c95003287f539b79b2e749