From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 13 Oct 2012 08:12:28 +0000 (+0200)
Subject: Merge branch 'release-0.8.4'
X-Git-Tag: 0.8.4^0
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b64f7d11fca2a616c8ceaf146a79fc3782877afd;hp=--cc;p=Sone.git

Merge branch 'release-0.8.4'
---

b64f7d11fca2a616c8ceaf146a79fc3782877afd