From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 21 Nov 2011 18:10:53 +0000 (+0100)
Subject: Merge branch 'release-0.7.4'
X-Git-Tag: 0.7.4
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c239cc4902df734bfc476874e6b0bca3b64009c3;p=Sone.git

Merge branch 'release-0.7.4'
---

ba4811ca5360e93b449629132b4c6583aa82eb1a