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

Trivial merge