[Dolibarr-git] [Dolibarr/dolibarr] 7d6779: Merge remote-tracking branch 'origin/3.5' into dev...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7d6779bd4ab3475f1d63c1e718366c09cd17a32f
      
https://github.com/Dolibarr/dolibarr/commit/7d6779bd4ab3475f1d63c1e718366c09cd17a32f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php

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


  Commit: a3375171937d1ae5a1b9c4c2379758fedf7d4315
      
https://github.com/Dolibarr/dolibarr/commit/a3375171937d1ae5a1b9c4c2379758fedf7d4315
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-30 (Mon, 30 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/338ee2dbbc30...a3375171937d