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

Merge branch 'release-0.3.6'
---

2001770a82d5da588b466ecacde4c6fcf4c83ea5