From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 15 Jan 2011 22:14:09 +0000 (+0100)
Subject: Merge branch 'release-0.4'
X-Git-Tag: 0.4^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=d53a79eeb9531a08173431ce2ba19156eeca4a0c

Merge branch 'release-0.4'
---

d53a79eeb9531a08173431ce2ba19156eeca4a0c