From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 8 Oct 2012 12:32:50 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.4^2~7
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d7587174bf34fcba0da336b438aa4dce920aab23;hp=-c;p=Sone.git

Merge branch 'master' into next
---

d7587174bf34fcba0da336b438aa4dce920aab23