Merge branch 'release-0.0.5' 0.0.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 14:29:38 +0000 (16:29 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 14:29:38 +0000 (16:29 +0200)

Trivial merge