Merge branch 'release-0.8.6' 0.8.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 5 Jul 2013 19:09:34 +0000 (21:09 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 5 Jul 2013 19:09:34 +0000 (21:09 +0200)

Trivial merge