Jo-Philipp Wich 848e43a5b4 remove .i18n annotations from controller files		2012-11-26 12:53:43 +00:00
..
controller	remove .i18n annotations from controller files	2012-11-26 12:53:43 +00:00
model/cbi	merge branch changes into trunk	2012-10-29 13:09:31 +00:00