[Dolibarr-git] [Dolibarr/dolibarr] 8845a7: Fix: doxygen

[Laurent Destailleur]

  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8845a7c4ab2df51abdd543c4734ad0f727daa2d1
      
https://github.com/Dolibarr/dolibarr/commit/8845a7c4ab2df51abdd543c4734ad0f727daa2d1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php

  Log Message:
  -----------
  Fix: doxygen


  Commit: bbe1876882e0b838e3ef813fdb7998a0359a7969
      
https://github.com/Dolibarr/dolibarr/commit/bbe1876882e0b838e3ef813fdb7998a0359a7969
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/core/class/html.form.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/75bafab17ba6...bbe1876882e0