Michael RICOIS eb6769e435 Reimport commit before conflict		2014-03-05 16:16:12 +00:00
..
config	Reimport commit before conflict	2014-03-05 16:16:12 +00:00
configure.php	Merge all change from 2.4	2013-09-16 15:41:31 +00:00
getCatalog.php	Merge from 2.4 for release	2013-11-29 13:54:52 +00:00