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=refs%2Ftags%2F0.6.7;hp=ea83b8353e1544dfdee77a8c1490edef2cf97338;p=Sone.git

Merge branch 'release-0.6.7'
---