Merge branch 'release-0.8.3' 0.8.3
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 8 Oct 2012 12:14:38 +0000 (14:14 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 8 Oct 2012 12:14:38 +0000 (14:14 +0200)

Trivial merge