From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 6 Jan 2011 13:42:06 +0000 (+0100)
Subject: Merge branch 'release-0.3.6.4'
X-Git-Tag: 0.3.6.4
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=refs%2Ftags%2F0.3.6.4

Merge branch 'release-0.3.6.4'
---

78732261f2de3d2f885ca02493cb443fc8d8aaf7