tree 6ebbb9f360df6967ab7165bd1f8703d179f633ea
parent cb72e01e9d1639cab03debf560b59cd6762a822e
parent 06757a19ef1df9262924094899fa81f21e6e19c5
author Anand Doshi <anand@erpnext.com> 1383551079 +0530
committer Anand Doshi <anand@erpnext.com> 1383551079 +0530

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

Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv