[Dolibarr-git] [Dolibarr/dolibarr] 6cd5d2: Updated ADOdb Date Time Library to v0.32

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6cd5d2724a46dbc56625d40f120f8ee27679658f
      
https://github.com/Dolibarr/dolibarr/commit/6cd5d2724a46dbc56625d40f120f8ee27679658f
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-05-03 (Sat, 03 May 2014)

  Changed paths:
    M COPYRIGHT
    M htdocs/includes/adodbtime/adodb-time.inc.php

  Log Message:
  -----------
  Updated ADOdb Date Time Library to v0.32

Includes important fixes for PHP 5


  Commit: 61e1500d1219395878a69095005bd517a3f757c3
      
https://github.com/Dolibarr/dolibarr/commit/61e1500d1219395878a69095005bd517a3f757c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-04 (Sun, 04 May 2014)

  Changed paths:
    M COPYRIGHT
    M htdocs/includes/adodbtime/adodb-time.inc.php

  Log Message:
  -----------
  Merge branch 'adodbtimeupdate' of github.com:GPCsolutions/dolibarr into
GPCsolutions-adodbtimeupdate

Conflicts:
        COPYRIGHT


  Commit: 95906a9acd298c403c805eb915418ab479a64df1
      
https://github.com/Dolibarr/dolibarr/commit/95906a9acd298c403c805eb915418ab479a64df1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-04 (Sun, 04 May 2014)

  Changed paths:
    M COPYRIGHT
    M htdocs/includes/adodbtime/adodb-time.inc.php

  Log Message:
  -----------
  Merge branch 'GPCsolutions-adodbtimeupdate' into develop


  Commit: d584d29ecfc0e349ec099a387bbe7f9fc7ac02a9
      
https://github.com/Dolibarr/dolibarr/commit/d584d29ecfc0e349ec099a387bbe7f9fc7ac02a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-04 (Sun, 04 May 2014)

  Changed paths:
    M htdocs/langs/fr_FR/products.lang
    M htdocs/product/index.php
    M htdocs/societe/index.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/93393db99171...d584d29ecfc0