[Dolibarr-git] [Dolibarr/dolibarr] 0d1889: Merge from 3.4

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0d188925064ab2de25c67bc640d86300a6657bad
      
https://github.com/Dolibarr/dolibarr/commit/0d188925064ab2de25c67bc640d86300a6657bad
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-19 (Sun, 19 Jan 2014)

  Changed paths:
    M ChangeLog
    M dev/dolibarr_changes.txt
    M htdocs/comm/index.php
    M htdocs/comm/propal/index.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/modules/modAgenda.class.php
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.asp
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.aspx
    R htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.cf
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.jsp
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
    R htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl
    R htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
    R htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.rb
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_huck.lasso
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree_sabourdin.lasso
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/projet/class/task.class.php
    M htdocs/theme/amarok/img/favicon.ico
    A htdocs/theme/auguria/img/favicon.ico
    M htdocs/theme/bureau2crea/img/favicon.ico
    M htdocs/theme/cameleo/img/favicon.ico
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/img/favicon.ico

  Log Message:
  -----------
  Merge from 3.4