From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 8 Mar 2011 06:12:09 +0000 (+0100)
Subject: Merge branch 'release-0.5'
X-Git-Tag: 0.5^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=13b6e1517335f9e1bcf883ddd6f27fde95ce551b

Merge branch 'release-0.5'
---

13b6e1517335f9e1bcf883ddd6f27fde95ce551b