// cashondelivery: string easier to translate.
Merge pull request #1 from xBorderie/patch-1

// cashondelivery: string easier to translate.
[-] MO : cashondelivery - Fix 1.5 ps_version_compliancy issue
Merge branch 'dev'

Conflicts:
	config.xml
Merge branch 'dev'
/Version update