[Dolibarr-git] [Dolibarr/dolibarr] b182b2: Update changelog

[Laurent Destailleur]

  Branch: refs/heads/3.5_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b182b2ff44e9d5957034ef06067df2f2b978330d
      
https://github.com/Dolibarr/dolibarr/commit/b182b2ff44e9d5957034ef06067df2f2b978330d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: 97eccac9a034c139e424f6f92d9c121b1a5eba35
      
https://github.com/Dolibarr/dolibarr/commit/97eccac9a034c139e424f6f92d9c121b1a5eba35
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog

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


  Commit: a5f8f9d8ee775561e0f3513888ca14079488a6ad
      
https://github.com/Dolibarr/dolibarr/commit/a5f8f9d8ee775561e0f3513888ca14079488a6ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or
content template.

Conflicts:
        ChangeLog
        htdocs/comm/propal.php
        htdocs/commande/fiche.php
        htdocs/compta/facture.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8f88864d69b7...a5f8f9d8ee77