From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 6 Jan 2011 14:50:28 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~3
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3ff1cdf09693a28719246a9a98a8b908e8c848f7

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

3ff1cdf09693a28719246a9a98a8b908e8c848f7