Merge branch 'release-0.8.9' 0.8.9
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 May 2014 17:56:07 +0000 (19:56 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 May 2014 17:56:07 +0000 (19:56 +0200)

Trivial merge