[MERGE] Switch nick too

[John Arbash Meinel]

John Arbash Meinel has voted resubmit.
Status is now: Resubmit
Comment:
I think the general consensus is that we should use 
"get_master_branch().nick". If that isn't the case, then we should 
discuss it more on the mailing list.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C418c22640807222226s7c2a544n2d34469a2c3e91a1%40mail.gmail.com%3E
Project: Bazaar