From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 15 Jul 2015 18:48:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'hsaito/master' into next
X-Git-Tag: 0.9^2~3^2~1
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=fcd3a59e73209164daed5947cd58ff0918b947b8;p=Sone.git

Merge remote-tracking branch 'hsaito/master' into next
---

fcd3a59e73209164daed5947cd58ff0918b947b8