From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 26 May 2014 18:02:30 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.9-rc1^2~3^2~261
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=35d92477b4e4b00c06562e4aac609764250bf8c3;p=Sone.git

Merge branch 'master' into next
---

35d92477b4e4b00c06562e4aac609764250bf8c3