From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Nov 2011 08:00:13 +0000 (+0100)
Subject: Merge branch 'release-0.7.5'
X-Git-Tag: 0.7.5^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=89e431b7cda6e2091bad97c9bfa2aa1b3f4409f0;hp=-c

Merge branch 'release-0.7.5'
---

89e431b7cda6e2091bad97c9bfa2aa1b3f4409f0