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^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=78732261f2de3d2f885ca02493cb443fc8d8aaf7;hp=eaaa7a31df99f5738f5f3a0b01b55fbbce653eca

Merge branch 'release-0.3.6.4'
---