Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic
Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into 3.6_nomadic
Typo
Untranslatable token Calendar in datepicker
Merge pull request #2132 from aspangaro/3.6-patch1

Typo
Merge pull request #2131 from aspangaro/3.6-patch

Untranslatable token Calendar in datepicker
Prepare 3.5.6
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic