* Show in the conflict resolver of addressees, the fields: email, and url.
* Show in the conflict resolver of addressees, the fields: email, and url.

svn path=/trunk/kdepim/; revision=360851

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi