[MERGE] remove 'branch-name' from format 6 branches

[John Arbash Meinel]

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

Martin Pool wrote:
> Martin Pool has voted approve.
> Status is now: Approved
> Comment:
> I thought this might have been used for the branch nick.  If that's
> elsewhere and this file is actually not used, it's ok with me to remove it.
> 
> For details, see:
> http://bundlebuggy.aaronbentley.com/request/%3C47339825.9010007%40arbash-meinel.com%3E

- From everything I can tell (with testing 'bzr nick foo') it is actually stored
in branch.conf.

And I can say that modifying the file and doing "bzr nick" doesn't change anything.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHM5xMJdeBCYSNAAMRAl9DAJ9+UQbqCIIG9TLd00877EkBhe/tdwCg0JrK
GXL/NK1kMiPgUfYX6zqzeoI=
=63WK
-----END PGP SIGNATURE-----