[Dolibarr-git] [Dolibarr/dolibarr] 2b7b7e: Fix: for avoid conflict with "global $m" in memory...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2b7b7e014d5c7ae10985975d26284cca58d36995
      
https://github.com/Dolibarr/dolibarr/commit/2b7b7e014d5c7ae10985975d26284cca58d36995
  Author: Regis Houssin <address@hidden>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M htdocs/comm/mailing/cibles.php

  Log Message:
  -----------
  Fix: for avoid conflict with "global $m" in memory.lib.php


  Commit: 3591f51918a0f092d02f7986d9411b3977becfc9
      
https://github.com/Dolibarr/dolibarr/commit/3591f51918a0f092d02f7986d9411b3977becfc9
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-30 (Sat, 30 Jan 2016)

  Changed paths:
    M htdocs/comm/mailing/cibles.php

  Log Message:
  -----------
  Merge pull request #4480 from hregis/3.8_bug

Fix: for avoid conflict with "global $m" in memory.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e574ebe34cdc...3591f51918a0