florian HENRY afb924043f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_fix5353 Conflicts: htdocs/core/modules/mailings/advthirdparties.modules.php		2016-07-04 20:43:14 +02:00
..
phpexcel	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2016-07-04 20:43:14 +02:00