From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 5 Jul 2013 19:18:11 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.7^2~46
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=d9f0a171bab2137df371a7c4948a95d1975116c0

Merge branch 'master' into next
---

d9f0a171bab2137df371a7c4948a95d1975116c0