[Dolibarr-git] [Dolibarr/dolibarr] d5c715: FIX #6102

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d5c7151bc827a406ffb140d737edc33ae5d4d273
      
https://github.com/Dolibarr/dolibarr/commit/d5c7151bc827a406ffb140d737edc33ae5d4d273
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/install/inc.php

  Log Message:
  -----------
  FIX #6102


  Commit: 338db9227544614a572e999ac5c3a7758ee6b78d
      
https://github.com/Dolibarr/dolibarr/commit/338db9227544614a572e999ac5c3a7758ee6b78d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-10 (Sat, 10 Dec 2016)

  Changed paths:
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/lib/emailing.lib.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/societe/soc.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/facd0d97431c...338db9227544