From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 30 Dec 2010 21:25:23 +0000 (+0100)
Subject: Merge branch 'release-0.3.6'
X-Git-Tag: 0.3.6
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=0a9cbe26ac72863b95ab307c6a291351e6758531;p=Sone.git

Merge branch 'release-0.3.6'
---

2001770a82d5da588b466ecacde4c6fcf4c83ea5