From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 8 May 2011 18:13:20 +0000 (+0200)
Subject: Merge branch 'release-0.6.4'
X-Git-Tag: 0.6.4
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ec4d4a425f4576fce17e76eea764379b1aa79a78;p=Sone.git

Merge branch 'release-0.6.4'
---

b72db16cd16e8bfbaadc44604bdff3f49a1aff51