[Dolibarr-git] [Dolibarr/dolibarr] 0080c0: Merge branch 'develop' of ssh://address@hidden/Dol...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 0080c07c1810b6a2948656bf6a1f25d0ca171b93
      
https://github.com/Dolibarr/dolibarr/commit/0080c07c1810b6a2948656bf6a1f25d0ca171b93
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M htdocs/comm/propal.php
  M htdocs/commande/liste.php
  M htdocs/compta/facture.php
  M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
  M htdocs/conf/conf.php.example
  M htdocs/core/lib/admin.lib.php
  M htdocs/core/lib/functions.lib.php
  M htdocs/core/modules/DolibarrModules.class.php
  M htdocs/core/modules/mailings/contacts3.modules.php
  M htdocs/core/tpl/freeproductline_view.tpl.php
  M htdocs/install/etape1.php
  M htdocs/install/etape2.php
  M htdocs/install/etape5.php
  M htdocs/install/fileconf.php
  M htdocs/langs/ca_ES/bills.lang
  M htdocs/langs/ca_ES/boxes.lang
  M htdocs/langs/ca_ES/contracts.lang
  M htdocs/langs/ca_ES/errors.lang
  M htdocs/langs/ca_ES/install.lang
  M htdocs/langs/en_US/install.lang
  M htdocs/langs/es_ES/bills.lang
  M htdocs/langs/es_ES/boxes.lang
  M htdocs/langs/es_ES/contracts.lang
  M htdocs/langs/es_ES/errors.lang
  M htdocs/langs/es_ES/install.lang
  M htdocs/langs/fr_FR/install.lang

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


  Commit: 57e5f3b28b538813ff19ac534deb36260bc3292a
      
https://github.com/Dolibarr/dolibarr/commit/57e5f3b28b538813ff19ac534deb36260bc3292a
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M build/pad/pad_dolibarr.xml

  Log Message:
  -----------
  Fix: version


Compare: https://github.com/Dolibarr/dolibarr/compare/f803ca4...57e5f3b