Merge branch 'release-0.0.6' 0.0.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 15:51:04 +0000 (17:51 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 15:51:04 +0000 (17:51 +0200)

Trivial merge