From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 27 Sep 2013 04:29:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'hernic/patch-4' into next
X-Git-Tag: 0.8.8^2~28
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=131a7e74b3417a8b8fe3132da018a13286652509

Merge remote-tracking branch 'hernic/patch-4' into next
---

131a7e74b3417a8b8fe3132da018a13286652509