Laurent Destailleur 6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php

2013-02-12 15:17:22 +01:00

..

holiday.class.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-02-12 15:17:22 +01:00