From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 11 Jul 2016 17:55:51 +0000 (+0200)
Subject: Merge branch 'release-0.9.5'
X-Git-Tag: 0.9.5
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=16e6b7326b5ff0fd880bfe5f2c3fbb94fed796be;hp=-c;p=Sone.git

Merge branch 'release-0.9.5'
---

c4ae226ec5052116cefc542ae2017036a7bc6332