From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 12 Sep 2011 11:40:56 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.6.7^2~2
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2b909e4272b408c5272aec67fd24f8c352245260;p=Sone.git

Merge branch 'master' into next
---

2b909e4272b408c5272aec67fd24f8c352245260