From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 25 Sep 2013 18:10:36 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.8^2~30
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=623f92f9abf500113abfc6e7eacc81dc4c0ba2b7;p=Sone.git

Merge branch 'master' into next
---

623f92f9abf500113abfc6e7eacc81dc4c0ba2b7