Merge branch 'release-0.8.2' 0.8.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 13 Jul 2012 22:39:42 +0000 (00:39 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 13 Jul 2012 22:39:42 +0000 (00:39 +0200)

Trivial merge