From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 10 Apr 2011 19:06:23 +0000 (+0200)
Subject: Merge branch 'release-0.6.1'
X-Git-Tag: 0.6.1^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=58eeba9b521b0a0094ac90a37fd88811c6a27376

Merge branch 'release-0.6.1'
---

58eeba9b521b0a0094ac90a37fd88811c6a27376