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/?p=Sone.git;a=commitdiff_plain;h=refs%2Ftags%2F0.9.6;hp=ff7d6b4652e7ff3c035cf89516b134daf5f756b7

Merge branch 'release-0.9.6'
---