Laurent Destailleur 181f16543d Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss 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/filefunc.inc.php		2013-09-06 01:42:40 +02:00
..
virtualmin	Merge remote-tracking branch 'origin/3.4' into develop	2013-09-06 01:42:40 +02:00