[merge] fix version-info if not in a branch

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> Thanks for the bug report. Actually, another effect is that 'bzr
> version-info' doesn't work on just a Branch either.
> So I added a test, and a different fix for it. All of this is tacked on
> top of my unicode fixes for Rio and stanzas.

+1 on this fix.  Lemme look at the prereqs...

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFFASc0F+nu1YWqI0RArVnAJ9nRFVZfdAqb1mc6CSl/qBJ9C8wVwCeIRtg
PhgHAa5/gIGSeNPhigwswNo=
=upIk
-----END PGP SIGNATURE-----