[Dolibarr-git] [Dolibarr/dolibarr] 44b5b9: Fix [ bug #733 ]

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 44b5b98308a8512a26d28582a796a9a53cf4d061
      
https://github.com/Dolibarr/dolibarr/commit/44b5b98308a8512a26d28582a796a9a53cf4d061
  Author: fhenry <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M htdocs/admin/mails.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/core/class/doleditor.class.php

  Log Message:
  -----------
  Fix [ bug #733 ]


  Commit: af6bb94ff3ea24a07c66e1cd8d2883d6817b307a
      
https://github.com/Dolibarr/dolibarr/commit/af6bb94ff3ea24a07c66e1cd8d2883d6817b307a
  Author: fhenry <address@hidden>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/tpl/objectline_add.tpl.php

  Log Message:
  -----------
  Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3


  Commit: 18aff923665e1a35e1ba75e861cfc2dc6bb66f45
      
https://github.com/Dolibarr/dolibarr/commit/18aff923665e1a35e1ba75e861cfc2dc6bb66f45
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M htdocs/admin/mails.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/core/class/doleditor.class.php

  Log Message:
  -----------
  Merge pull request #683 from FHenry/3.3

Fix [ bug #733 ]


  Commit: 402fe2e4178be9de1a4d8a53b220045fd2221214
      
https://github.com/Dolibarr/dolibarr/commit/402fe2e4178be9de1a4d8a53b220045fd2221214
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M htdocs/admin/mails.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/core/class/doleditor.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dacba745c592...402fe2e4178b