Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Dolibarr · Mar 19, 2014 · ecdba9d · ecdba9d
2 parents 559c652 + 9cd7f68
commit ecdba9d
Show file tree

Hide file tree

Showing 4 changed files with 257 additions and 99 deletions.
diff --git a/build/debian/dolibarr.install b/build/debian/dolibarr.install
@@ -1,6 +1,5 @@
 debian/dolibarr.desktop usr/share/applications
 debian/dolibarr.xpm usr/share/pixmaps
-ChangeLog usr/share/doc/dolibarr
 README usr/share/doc/dolibarr
 doc/install usr/share/doc/dolibarr
 doc/user usr/share/doc/dolibarr