Laurent Destailleur addedb6f15 Merge branch 'develop' of https://github.com/FHenry/dolibarr into ...

FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php

2013-11-05 19:53:49 +01:00

..

contact.class.php

Merge branch 'develop' of https://github.com/FHenry/dolibarr into

2013-11-05 19:53:49 +01:00