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

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 520aaa2238d83700e2db01e8b5b89e89dc262f7f
      
https://github.com/Dolibarr/dolibarr/commit/520aaa2238d83700e2db01e8b5b89e89dc262f7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M htdocs/admin/limits.php
  M htdocs/core/ajax/constantonoff.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/lib/admin.lib.php
  M htdocs/core/lib/ajax.lib.php
  M htdocs/fourn/commande/contact.php

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


  Commit: c92dbe7e6142517b5a4dc0a542d8c41752c0f4d3
      
https://github.com/Dolibarr/dolibarr/commit/c92dbe7e6142517b5a4dc0a542d8c41752c0f4d3
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M htdocs/core/ajax/fileupload.php

  Log Message:
  -----------
  Qual: Try to remove warning on private properties


Compare: https://github.com/Dolibarr/dolibarr/compare/376759c...c92dbe7