From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 2 Apr 2011 22:14:03 +0000 (+0200)
Subject: Merge branch 'release-0.6'
X-Git-Tag: 0.6
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1a621988bcb7bb71027392a1cb2579aef0f34ce6;p=Sone.git

Merge branch 'release-0.6'
---

ee05a67b3f1e796b6c4bdcd709ef0983103c455f