[Dolibarr-git] [Dolibarr/dolibarr] 1dcb3e: Prepare 3.1.2 snapshot

[Laurent Destailleur]

  Branch: refs/heads/3.1
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1dcb3efd805fb7a42354762bac5067f695666193
      
https://github.com/Dolibarr/dolibarr/commit/1dcb3efd805fb7a42354762bac5067f695666193
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/filefunc.inc.php
    M htdocs/install/inc.php
    M htdocs/support/inc.php

  Log Message:
  -----------
  Prepare 3.1.2 snapshot


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

  Changed paths:
    M ChangeLog
    M build/deb/changelog
    M build/doxygen/dolibarr-doxygen.doxyfile
    M build/doxygen/hudson-doxygen.doxyfile
    M build/exe/doliwamp/doliwamp.iss
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    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/imports/class/import.class.php
    M htdocs/install/inc.php

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

Conflicts:
        htdocs/install/inc.php


Compare: https://github.com/Dolibarr/dolibarr/compare/dc5aa65...ff88510