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

develop

Conflicts:
	build/debian/get-orig-source.sh

ChangeLog

@@ -6,8 +6,8 @@ English Dolibarr ChangeLog
 For users:
 - New: Add hidden option BANK_DISABLE_DIRECT_INPUT.
 - New: More options to select status of users into select user list.
-- New: [ task #862 ] Add ODT on shipments
-- New: [ task #149 ] Add # of notes and attachments in tabs
+- New: [ task #862 ] Add ODT on shipments.
+- New: [ task #149 ] Add # of notes and attachments in tabs.
 - New: Can edit customer ref at eny time.
 - New: [ task #877 ] Reorganize menus.
 - New: [ task #858 ] Holiday module: note on manual holiday assignation.