[Dolibarr-git] [Dolibarr/dolibarr] eaf735: Fix: Clean orphelins

[eldy]

  Branch: refs/heads/3.1-beta
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: eaf7356d0fece33ac56595a34222fd80c2ad48bb
      
https://github.com/Dolibarr/dolibarr/commit/eaf7356d0fece33ac56595a34222fd80c2ad48bb
  Author: eldy <address@hidden>
  Date:   2011-08-24 (Wed, 24 Aug 2011)

  Changed paths:
    M htdocs/install/mysql/migration/3.0.0-3.1.0.sql

  Log Message:
  -----------
  Fix: Clean orphelins


  Commit: 98f6ec14f01ac70973024ba40ad3927cd03d36ef
      
https://github.com/Dolibarr/dolibarr/commit/98f6ec14f01ac70973024ba40ad3927cd03d36ef
  Author: eldy <address@hidden>
  Date:   2011-08-24 (Wed, 24 Aug 2011)

  Changed paths:
    M .settings/org.eclipse.php.core.prefs
  M htdocs/install/mysql/migration/3.0.0-3.1.0.sql

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

Conflicts:
        htdocs/install/mysql/migration/3.0.0-3.1.0.sql


Compare: https://github.com/Dolibarr/dolibarr/compare/7e3abf7...98f6ec1