Fix: Pb when using virtual products inside virtual products
Fix: Korting
Missing translation
Fix: broken features for fileupload
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: merge problem
Fix: broken features
Fix: missing commit
FIXME regresion if code with not in numeric base
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Removed warning
Fix: Removed bad test
Fix: log must use the mask defined into setup

Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
Prepare for 3.3.2
Prepare 3.3.2
Update debian doc
Fix doc
Prepare 3.3.2
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php