From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 18 Dec 2010 11:10:49 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~42
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=316b9c2b3d16792975434644ae39a9b1814f32c4

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

316b9c2b3d16792975434644ae39a9b1814f32c4