From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 26 Oct 2016 16:48:04 +0000 (+0200)
Subject: Merge branch 'release-0.9.6'
X-Git-Tag: 0.9.6
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=565b22dfe7bb80bc221e4050497364f9a7951cd8;p=Sone.git

Merge branch 'release-0.9.6'
---

7b55e0be6a3283e43a9bbab98f82aebdd948eb33