From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 29 Jun 2013 14:19:50 +0000 (+0200)
Subject: Merge branch 'release-0.8.5'
X-Git-Tag: 0.8.5
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5c6c7242524926562a7f999aade630caf70a8def;p=Sone.git

Merge branch 'release-0.8.5'
---

6e9a43ccd93ae125720547c0fe421dc81a54ba90