3 Commits

Author	SHA1	Message	Date
Deven Bansod	c62672edd0	Merge branch 'QA_4_5' ... Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Conflicts: po/cs.po po/fi.po po/it.po po/nb.po po/nl.po po/sv.po	2015-11-12 23:49:31 +05:30
Madhura Jayaratne	b31248fba4	Fix regression introduced while moving controllers ... Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>	2015-11-04 07:22:56 +11:00
Madhura Jayaratne	a701078e00	Move the controller to appropriate package ... Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>	2015-11-03 13:25:17 +11:00