From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 9 Jun 2013 08:25:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'hernic/patch-1' into next
X-Git-Tag: 0.8.5^2~5
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=77804f0dda317541f8451a0649785e7cb192d696;p=Sone.git

Merge remote-tracking branch 'hernic/patch-1' into next
---

77804f0dda317541f8451a0649785e7cb192d696