From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 2 Apr 2011 22:18:02 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.6.1^2~49
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9010ebc0ff528c01d11ba20ad1ab5a6ff8696787;p=Sone.git

Merge branch 'master' into next
---

9010ebc0ff528c01d11ba20ad1ab5a6ff8696787