Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git

into develop Conflicts: htdocs/contact/class/contact.class.php test/phpunit/ContactTest.php test/phpunit/SocieteTest.php

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
e97078f6 · Laurent Destailleur · 55156edd · 4bf03a2d · e97078f6 · e97078f6
Commit e97078f6 authored 13 years ago by Laurent Destailleur
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php