Comment
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php