Laurent Destailleur 0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: .travis.yml		2014-07-08 20:22:51 +02:00
..
project.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-06-25 20:22:25 +02:00
task.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-07-08 20:22:51 +02:00