Merge branch 'protocol-version' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 1 Jan 2011 18:17:58 +0000 (19:17 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 1 Jan 2011 18:17:58 +0000 (19:17 +0100)

Trivial merge