Laurent Destailleur 040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/expensereport/card.php htdocs/projet/element.php		2015-06-23 18:34:39 +02:00
..
pdf_standard.modules.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2015-06-23 18:34:39 +02:00