[Dolibarr-git] [Dolibarr/dolibarr] f52cb1: Fix: We must not define language var if parm not d...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f52cb1b5711ba4e6aec64bbb707d3c3150bcee13
      
https://github.com/Dolibarr/dolibarr/commit/f52cb1b5711ba4e6aec64bbb707d3c3150bcee13
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Fix: We must not define language var if parm not defined.


  Commit: 90569e264c7649202fb7e2eb1b8d1ccbb8872dba
      
https://github.com/Dolibarr/dolibarr/commit/90569e264c7649202fb7e2eb1b8d1ccbb8872dba
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

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

Conflicts:
        htdocs/master.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c041feec6ab7...90569e264c76