LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr'
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Qual: Using divs instead of tables
Merge pull request #691 from grandoc/develop

english language standardization
LDAP : sync script now updates or create user
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
LDAP : add option to get data as an array
Merge pull request #692 from atm-maxime/develop

LDAP sync improvements
New: Function plimit of databases drivers accept -1 as value (it means
default value set into conf->liste_limit).
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog