Merge branch 'release-0.8.8' 0.8.8
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 27 Feb 2014 20:38:22 +0000 (21:38 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 27 Feb 2014 20:38:22 +0000 (21:38 +0100)

Trivial merge