[Dolibarr-git] [Dolibarr/dolibarr] ef6b96: Fix #3236

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ef6b96b4c7394a6b70991be2ea8a8ad9abcec943
      
https://github.com/Dolibarr/dolibarr/commit/ef6b96b4c7394a6b70991be2ea8a8ad9abcec943
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/langs/en_US/printing.lang
    M htdocs/printing/admin/printing.php

  Log Message:
  -----------
  Fix #3236


  Commit: af55c8467b3efc25f7f327caa093757af3311eb1
      
https://github.com/Dolibarr/dolibarr/commit/af55c8467b3efc25f7f327caa093757af3311eb1
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/printing/admin/printing.php

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

# Conflicts:
#       htdocs/printing/admin/printing.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9f2b4c503e1b...af55c8467b3e