[Dolibarr-git] [Dolibarr/dolibarr] 101259: Fix for 3.6 beta

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1012595ff2ea365833301f1c8756d684be2a0ca3
      
https://github.com/Dolibarr/dolibarr/commit/1012595ff2ea365833301f1c8756d684be2a0ca3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-18 (Sun, 18 May 2014)

  Changed paths:
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Fix for 3.6 beta


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

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql
    M htdocs/contrat/class/contrat.class.php
    M htdocs/expedition/fiche.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5dffa919ced6...fb9a0f224bcd