From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 11 Jul 2016 18:03:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.9.6^2~57
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=998ef3f761f563eeabf37beb07f639ae2ba0739b;p=Sone.git

Merge branch 'master' into next
---

998ef3f761f563eeabf37beb07f639ae2ba0739b