From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 12 Sep 2011 13:04:50 +0000 (+0200)
Subject: Merge branch 'release-0.6.7'
X-Git-Tag: 0.6.7
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=dcd855a3a703fcf8adea143132f4b40a370fc3b6;p=Sone.git

Merge branch 'release-0.6.7'
---

f399a0d5d29599c318a0f14f109a26a6667c1230