From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 29 Oct 2010 04:47:52 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.2-RC1~98
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e;p=Sone.git

Merge branch 'master' into next
---

b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e