From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 7 Oct 2017 18:08:53 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.9.8^2~34
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c63b70fad1e344c1d0d96056565f01fb343e0dfa;p=Sone.git

Merge branch 'master' into next
---

c63b70fad1e344c1d0d96056565f01fb343e0dfa