From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 29 Jun 2013 14:45:18 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.6^2~17
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ce04d40ba9a3bfd505d86f8bdc50c1d206a0a111;p=Sone.git

Merge branch 'master' into next
---

ce04d40ba9a3bfd505d86f8bdc50c1d206a0a111