Regis Houssin f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git ... into task498_objectline Conflicts: htdocs/core/class/commonobject.class.php		2012-08-23 07:53:48 +02:00
..
commande.class.php	Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git	2012-08-23 07:53:48 +02:00
commandestats.class.php	Removed parenthesis from all include and include_once and replaced with single quotes	2012-08-23 02:40:41 +02:00