Laurent Destailleur 6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/holiday/fiche.php		2013-05-11 15:26:24 +02:00
..
user.class.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-05-11 15:26:24 +02:00
usergroup.class.php	Fix: Removed warnings	2013-04-26 19:13:39 +02:00