Madhura Jayaratne f6b7f98322 Fix merge conflicts ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2014-12-23 10:43:54 -05:00
..
auth	Add missing call to test	2014-12-01 11:56:19 +01:00
export	Fix merge conflicts	2014-12-23 10:43:54 -05:00
import	Remove unused locale variables.	2014-11-10 23:26:57 +01:00
transformations	No need to have a distinct file	2014-09-06 14:11:04 -04:00