[Dolibarr-git] [Dolibarr/dolibarr] 6151bc: Fix: more simple

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6151bc3a42778c85c5716a0529da8ebba80879bf
      
https://github.com/Dolibarr/dolibarr/commit/6151bc3a42778c85c5716a0529da8ebba80879bf
  Author: Regis Houssin <address@hidden>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix: more simple


  Commit: 2ef521ff306075adff34fb44b8684ee84c5f71e9
      
https://github.com/Dolibarr/dolibarr/commit/2ef521ff306075adff34fb44b8684ee84c5f71e9
  Author: Regis Houssin <address@hidden>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/ca_ES/donations.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d7bbd8e9476e...2ef521ff3060