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
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=refs%2Ftags%2F0.8.7;hp=ed0528d0036fddca62d88f15a564d0005631bedd;p=Sone.git

Merge branch 'release-0.8.7'
---