Marcos García 896a60296c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements ... Conflicts: htdocs/holiday/fiche.php		2013-05-06 17:22:31 +02:00
..
holiday.class.php	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements	2013-05-06 17:22:31 +02:00