Marc Alexander df2a0e0b00 Merge branch '3.2.x'		2017-06-05 10:54:46 +02:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch '3.2.x'	2017-06-05 10:54:46 +02:00