Philippe Caseiro 491383d4f0 Fix conflict		2014-11-12 15:00:42 +01:00
..
99_one-frontend.xml	Fix conflict	2014-11-12 15:00:42 +01:00