tree c456e2502a4ce609bdeb482b3ac4a57105f5dc1e
parent 2b349d38d94427897b7fddb7dbe7b79be48175fa
parent 58b8d6fdf3d49b04be6fcbff792adeb4388bf796
author Anand Doshi <anand@erpnext.com> 1366194020 +0530
committer Anand Doshi <anand@erpnext.com> 1366194020 +0530

Merge branch 'master' into edge

Conflicts:
	website/doctype/website_settings/website_settings.txt