[MERGE][BUG] 92195: merge-directive does not respect smtp_server setting

[Alexander Belchenko]

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

Vincent Ladeuil пишет:
> Trivial fix attached.

v-- one blank line between news items, please.

> 
> === modified file NEWS
> --- NEWS
> +++ NEWS
> @@ -46,6 +46,9 @@
>      * Switch the ``bzr init-repo`` default from --no-trees to --trees. 
>        (Wouter van Heyst, #53483)
>  
> +
> +    * Take smtp_server from user config into account.
> +      (vila, #92195)
>   
>  bzr 0.15rc1  2007-03-07
>  
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF9+yrzYr338mxwCURArKpAJ92IkRtBtYsBLx05sLHWf0hUTa7vwCdGTgK
VHhHH3UL7+ycv7ZbM1GatiY=
=NX92
-----END PGP SIGNATURE-----