[Dolibarr-git] [Dolibarr/dolibarr] 60e0b9: FIX #5972 #5734

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 60e0b93ec1160f3d75c963c0868e91243de01d06
      
https://github.com/Dolibarr/dolibarr/commit/60e0b93ec1160f3d75c963c0868e91243de01d06
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php

  Log Message:
  -----------
  FIX #5972 #5734


  Commit: 7ccc70e00d1b834f295b686dbdabec4a029a7356
      
https://github.com/Dolibarr/dolibarr/commit/7ccc70e00d1b834f295b686dbdabec4a029a7356
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  Fix as suggested for #5960


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a605e0b972a5...7ccc70e00d1b