From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 19 Jun 2011 14:41:00 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.6.6^2~71
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=20f2125c8a15ba58cbbf6410517d233934c1dc30;p=Sone.git

Merge branch 'master' into next
---

20f2125c8a15ba58cbbf6410517d233934c1dc30