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

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

02de134dcf3d4500ae02320aab2dae827d499fa1