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

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

db7d24156074d2735db4048a0e83cfe807500b3c