tree 70ad86b64e8793941739db091de1565d638d2f4a
parent b03f870441a7e1ff91538403c2ad13a9050275f6
parent 4bfaaf33aae9f84921befa296877cc4fc6f4584f
author Anand Doshi <anand@erpnext.com> 1383559450 +0530
committer Anand Doshi <anand@erpnext.com> 1383559450 +0530

Merge branch '1310' of github.com:webnotes/erpnext

Conflicts:
	patches/october_2013/p07_rename_for_territory.py
	patches/october_2013/p08_cleanup_after_item_price_module_change.py
	setup/doctype/setup_control/setup_control.py
	utilities/demo/demo_docs/Lead.csv