From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 27 Nov 2015 06:22:03 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.9.5^2~44
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1e9a08c2b73b16dc178437eb8c8025aaa083fcca;p=Sone.git

Merge branch 'master' into next
---

1e9a08c2b73b16dc178437eb8c8025aaa083fcca