Merge branch 'release-0.3.6.2' 0.3.6.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 23:57:39 +0000 (00:57 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 23:57:39 +0000 (00:57 +0100)

Trivial merge