[Dolibarr-git] [Dolibarr/dolibarr] b52dd7: Fix: Missing dependency

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b52dd702292c0cb38e6551c56a5bbeed559e72ec
      
https://github.com/Dolibarr/dolibarr/commit/b52dd702292c0cb38e6551c56a5bbeed559e72ec
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M build/debian/control

  Log Message:
  -----------
  Fix: Missing dependency


  Commit: 99210a1501ed2179d40ed384e4f6aa76b5969534
      
https://github.com/Dolibarr/dolibarr/commit/99210a1501ed2179d40ed384e4f6aa76b5969534
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M build/debian/control
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/bills.lang
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/ca_ES/cashdesk.lang
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/ca_ES/install.lang
    M htdocs/langs/ca_ES/mailmanspip.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/margins.lang
    A htdocs/langs/ca_ES/opensurvey.lang
    M htdocs/langs/ca_ES/paybox.lang
    M htdocs/langs/ca_ES/paypal.lang
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/cashdesk.lang
    M htdocs/langs/es_ES/cron.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/install.lang
    M htdocs/langs/es_ES/mailmanspip.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/margins.lang
    M htdocs/langs/es_ES/opensurvey.lang
    M htdocs/langs/es_ES/paybox.lang
    M htdocs/langs/es_ES/paypal.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/theme/amarok/style.css.php

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

Conflicts:
        build/debian/control


  Commit: 4c39bc9997435e17dcc0235d9cf08f55cb588387
      
https://github.com/Dolibarr/dolibarr/commit/4c39bc9997435e17dcc0235d9cf08f55cb588387
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M ChangeLog
    M README
    M README-FR
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/pdf.php
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/filefunc.inc.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/langs/es_ES/admin.lang
    M htdocs/paypal/admin/paypal.php
    R htdocs/webservices/demo_wsclient_actioncomm.php
    A htdocs/webservices/demo_wsclient_actioncomm.php-NORUN

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f2281a4e5881...4c39bc999743