Fix: Bad link
Fix: Total missing
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: rpm packages

Conflicts:
	build/rpm/dolibarr_generic.spec
Fix: Upgrade of package break install

Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
Fix: Color change on page break.
Fix: Watermark make pagebreak crazy.
 Fix [ bug #1001 ] Charge sociale : état incorrect
update changelog
Fix: date must be reported according to user timezone

Conflicts:
	htdocs/core/class/html.formfile.class.php
Prepare 3.3.4
Merge pull request #1134 from FHenry/3.3

 Fix [ bug #1001 ] Charge sociale : état incorrect
Fix: Changelog
Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company
Exclude conf.php file from git
fix some trad
Merge pull request #1181 from grandoc/3.3

fix some trad