[Dolibarr-git] [Dolibarr/dolibarr] 3c2b50: Include PR

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3c2b50c6a2dea4e6c5aef203397dc8d00c0d9924
      
https://github.com/Dolibarr/dolibarr/commit/3c2b50c6a2dea4e6c5aef203397dc8d00c0d9924
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-21 (Sun, 21 Feb 2016)

  Changed paths:
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/fr_FR/companies.lang

  Log Message:
  -----------
  Include PR


  Commit: 77fcdc2e1dd24647d158810fa22ffbbd1298cb23
      
https://github.com/Dolibarr/dolibarr/commit/77fcdc2e1dd24647d158810fa22ffbbd1298cb23
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-21 (Sun, 21 Feb 2016)

  Changed paths:
    A htdocs/core/modules/import/import_xlsx.modules.php
    M htdocs/imports/import.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fb0e74645e5f...77fcdc2e1dd2