Merge branch 'release-0.3.6.5' 0.3.6.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jan 2011 12:20:43 +0000 (13:20 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jan 2011 12:20:43 +0000 (13:20 +0100)

Trivial merge