[Dolibarr-git] [Dolibarr/dolibarr] ed6abb: Merge branch 'bug-2576' of https://github.com/marc...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
      
https://github.com/Dolibarr/dolibarr/commit/ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2576

Conflicts:
        ChangeLog


  Commit: 4de4c66bb74bb514129c986e8987f1aab7af9bdb
      
https://github.com/Dolibarr/dolibarr/commit/4de4c66bb74bb514129c986e8987f1aab7af9bdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5


  Commit: b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
      
https://github.com/Dolibarr/dolibarr/commit/b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Log Message:
  -----------
  Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5


Compare: 
https://github.com/Dolibarr/dolibarr/compare/be9ddb774857...b8c512a3d5d0