From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 26 Oct 2016 16:52:52 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.9.7^2~473
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=66313c70788a32a0940d3c22e70853906bbb427d;p=Sone.git

Merge branch 'master' into next
---

66313c70788a32a0940d3c22e70853906bbb427d