[MERGE] branch.has_explicit_nick

[Aaron Bentley]

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

Robert Collins wrote:
> This is what I'm submitting ... the change to use TestCaseWithTransport
> just makes the test simpler.

Looks good to me.

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

iD8DBQFEpWz50F+nu1YWqI0RAoLjAJ9HJKCw9sGM1CXqMRuEqNlE9tjFtQCeIY1d
vNTxDp0DZOt42SdM1sOpbdQ=
=W4LM
-----END PGP SIGNATURE-----