From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 29 Mar 2011 18:24:36 +0000 (+0200)
Subject: Merge branch 'release-0.5.2'
X-Git-Tag: 0.5.2
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e4239e8204ef04ad500ae08aea3142b18a3a39fe;p=Sone.git

Merge branch 'release-0.5.2'
---

cf563ebda93371a3088a1789eb628ed568658b14