From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 23 Jan 2013 21:57:30 +0000 (+0100)
Subject: Merge commit 'da609f721e54691f27113e877a19637bd332abc3' into less-critical
X-Git-Tag: 0.8.5^2~3^2~58^2~9
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b04f97f923dcae625ee2aaa15491c75864936b82

Merge commit 'da609f721e54691f27113e877a19637bd332abc3' into less-critical
---

b04f97f923dcae625ee2aaa15491c75864936b82