[Dolibarr-git] [Dolibarr/dolibarr] 981334: Fix: broken features and uniformize code

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 981334434655f18933b3a0232e78cd8475349780
      
https://github.com/Dolibarr/dolibarr/commit/981334434655f18933b3a0232e78cd8475349780
  Author: Regis Houssin <address@hidden>
  Date:   2012-09-01 (Sat, 01 Sep 2012)

  Changed paths:
    M htdocs/theme/bureau2crea/tpl/login.tpl.php

  Log Message:
  -----------
  Fix: broken features and uniformize code


  Commit: 671006316ae43ff47af020860589a4541730014a
      
https://github.com/Dolibarr/dolibarr/commit/671006316ae43ff47af020860589a4541730014a
  Author: Regis Houssin <address@hidden>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    A build/exe/doliwamp/README.md
    M htdocs/install/upgrade.php
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/fr_FR/install.lang

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


  Commit: 63564f8d5008822a897207b5a1cbd18c5ac81dcb
      
https://github.com/Dolibarr/dolibarr/commit/63564f8d5008822a897207b5a1cbd18c5ac81dcb
  Author: Regis Houssin <address@hidden>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
    M htdocs/user/passwordforgotten.php

  Log Message:
  -----------
  Fix: broken features


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1ccb8f33630f...63564f8d5008