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
Fix: Image was not correctly generated. Bad licence into it.
Fix: Image was not correctly generated. Bad licence into it.
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Fix: wash file
Fix: watch file for debian package.
Fix: debian files
Fix debian package
Fix: missing ;
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Enabled travis-ci on old branch
Fix: Bug with php 5.4
Fix: bug with php 5.4
Fix init data sql
Fix bad name
Fix: syntax error in ruleset.xml
Removed warnings