From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 13 Jul 2012 22:44:14 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.8.3^2~61
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=833dbb7db90dd09cec06fa8af25ebb3f4bb1aa93;p=Sone.git

Merge branch 'master' into next
---

833dbb7db90dd09cec06fa8af25ebb3f4bb1aa93