Merge branch 'release-0.8' 0.8
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 5 Mar 2012 05:29:25 +0000 (06:29 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 5 Mar 2012 05:29:25 +0000 (06:29 +0100)

Trivial merge