[Dolibarr-git] [Dolibarr/dolibarr] 6db131: Merge remote-tracking branch 'origin/3.3' into 3.3...

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6db131041e01b1122e954aac9f7f00d97f8a49fa
      
https://github.com/Dolibarr/dolibarr/commit/6db131041e01b1122e954aac9f7f00d97f8a49fa
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: abb873c962efe9c8cd7565aed85bc390e2877e9b
      
https://github.com/Dolibarr/dolibarr/commit/abb873c962efe9c8cd7565aed85bc390e2877e9b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/conf/.gitignore
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


  Commit: 2e821aa233f68008bc6d53cedb6a2ac414993063
      
https://github.com/Dolibarr/dolibarr/commit/2e821aa233f68008bc6d53cedb6a2ac414993063
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Fix: Size of picture into PDF


  Commit: 94cc966b45d05c28dc1bb3c161998f933a051af1
      
https://github.com/Dolibarr/dolibarr/commit/94cc966b45d05c28dc1bb3c161998f933a051af1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f7a33ba73793...94cc966b45d0