From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 15 Dec 2010 07:27:42 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~50
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=7379bb70d4db3b419deed77f0df95f74c4b0e038;p=Sone.git

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

7379bb70d4db3b419deed77f0df95f74c4b0e038