From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 7 Dec 2011 18:50:55 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8^2~45
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;ds=sidebyside;h=a92bf1d5f2fb416ee6f03c052dc30e9757283717;p=Sone.git

Merge branch 'master' into next
---

a92bf1d5f2fb416ee6f03c052dc30e9757283717