Laurent Destailleur b23bbc2432 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git ... into develop Conflicts: htdocs/projet/class/task.class.php		2012-04-15 18:49:09 +02:00
..
project.class.php	Fix: sorry it's ok	2012-04-15 18:33:14 +02:00
task.class.php	Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git	2012-04-15 18:49:09 +02:00