From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 28 Oct 2010 18:20:14 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.2-RC1~99
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5441ddb67671b8708417d91804f01bde85fbde2c;p=Sone.git

Merge branch 'master' into next
---

5441ddb67671b8708417d91804f01bde85fbde2c