[Dolibarr-git] [Dolibarr/dolibarr] a45ffe: Missing changelog

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a45ffeecca5eba9e050b2c36207fc1c923897a26
      
https://github.com/Dolibarr/dolibarr/commit/a45ffeecca5eba9e050b2c36207fc1c923897a26
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog


  Commit: 7f5670cb26c620efcfc4957fcbb59a9f76c85eb3
      
https://github.com/Dolibarr/dolibarr/commit/7f5670cb26c620efcfc4957fcbb59a9f76c85eb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-22 (Fri, 22 Apr 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e669dac3980f...7f5670cb26c6