From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 21 Dec 2010 11:08:45 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~41
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a8a97f37c2bd64a0bf4fe4cb38d61818f5f9a148;hp=--cc;p=Sone.git

Merge branch 'next' into edit-wot-trust
---

a8a97f37c2bd64a0bf4fe4cb38d61818f5f9a148