[Dolibarr-git] [Dolibarr/dolibarr] 057365: Fix: change for experimental encryption

[Regis Houssin]

  Branch: refs/heads/3.3
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 057365b69e837b6f1a8410acb55530ae47ac46d1
      
https://github.com/Dolibarr/dolibarr/commit/057365b69e837b6f1a8410acb55530ae47ac46d1
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql

  Log Message:
  -----------
  Fix: change for experimental encryption


  Commit: b80d4874e3c1e6428a22760d4d293549ef85dc88
      
https://github.com/Dolibarr/dolibarr/commit/b80d4874e3c1e6428a22760d4d293549ef85dc88
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/syslog.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql

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

Conflicts:
        htdocs/install/mysql/migration/3.2.0-3.3.0.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eb78de198136...b80d4874e3c1