Merge branch 'release-0.5' 0.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 8 Mar 2011 06:12:09 +0000 (07:12 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 8 Mar 2011 06:12:09 +0000 (07:12 +0100)

Trivial merge