Merge branch 'release-0.8.4' 0.8.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 13 Oct 2012 08:12:28 +0000 (10:12 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 13 Oct 2012 08:12:28 +0000 (10:12 +0200)

Trivial merge