Yoann Bonavero d81f21d7e5 Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter ... Conflicts: code/serveur/php/function.php code/serveur/php/pticlic.php		2011-02-03 09:05:54 +01:00
..
pticlic.php	Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter	2011-02-03 09:05:54 +01:00