From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 9 Jan 2011 12:20:43 +0000 (+0100)
Subject: Merge branch 'release-0.3.6.5'
X-Git-Tag: 0.3.6.5^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=915e48ef36a444907c00e818c8215db172c089a6

Merge branch 'release-0.3.6.5'
---

915e48ef36a444907c00e818c8215db172c089a6