[Dolibarr-git] [Dolibarr/dolibarr] 5e23f9: Merge branch 'develop' into 3.2

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5e23f946f8cf4dae2e3359e5faa7708f9ef63076
      
https://github.com/Dolibarr/dolibarr/commit/5e23f946f8cf4dae2e3359e5faa7708f9ef63076
  Author: Regis Houssin <address@hidden>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M ChangeLog
  M build/debian/changelog
  M build/doxygen/dolibarr-doxygen.doxyfile
  M build/exe/doliwamp/doliwamp.iss
  M build/makepack-dolibarr.pl
  M build/perl/virtualmin/dolibarr.pl
  M build/rpm/dolibarr_fedora.spec
  M build/rpm/dolibarr_generic.spec
  M build/rpm/dolibarr_mandriva.spec
  M build/rpm/dolibarr_opensuse.spec
  M htdocs/admin/expedition.php
  M htdocs/admin/ihm.php
  M htdocs/core/class/conf.class.php
  M htdocs/filefunc.inc.php
  M htdocs/install/check.php
  M htdocs/install/etape1.php
  M htdocs/install/etape2.php
  M htdocs/install/etape4.php
  M htdocs/install/etape5.php
  M htdocs/install/fileconf.php
  M htdocs/install/inc.php
  M htdocs/support/inc.php

  Log Message:
  -----------
  Merge branch 'develop' into 3.2

Conflicts:
        htdocs/admin/ihm.php
        htdocs/core/class/conf.class.php