[Dolibarr-git] [Dolibarr/dolibarr] 8801d7: Fix: reorder lines problem

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8801d7a1eb1eceee437d0dc687d307ba892f94e7
      
https://github.com/Dolibarr/dolibarr/commit/8801d7a1eb1eceee437d0dc687d307ba892f94e7
  Author: Regis Houssin <address@hidden>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Fix: reorder lines problem


  Commit: 8661d9bfa020f824f66292e895f8e1a315c54b60
      
https://github.com/Dolibarr/dolibarr/commit/8661d9bfa020f824f66292e895f8e1a315c54b60
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-13 (Sun, 13 Oct 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
        htdocs/core/class/commonobject.class.php
        htdocs/core/class/html.form.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/124081611ed3...8661d9bfa020