From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 25 Jan 2013 19:14:21 +0000 (+0100)
Subject: Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical
X-Git-Tag: 0.8.5^2~3^2~51
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=3c04419570520b0c7158dbb8c27083d419afdf47;p=Sone.git

Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical
---

3c04419570520b0c7158dbb8c27083d419afdf47