From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 25 Sep 2013 17:28:02 +0000 (+0200)
Subject: Merge branch 'release-0.8.7'
X-Git-Tag: 0.8.7^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=7017646bf42cb265b6df539bb6def40b91d2f968

Merge branch 'release-0.8.7'
---

7017646bf42cb265b6df539bb6def40b91d2f968