tree 74786755a1e2ea649f47aa7098748562fcbd6957
parent 851b9c0aade9f8ca91771329261511a887a4860b
parent de293e51fcdc29c2cd30f0a044a4b9002e6644c6
author Anand Doshi <anand@iwebnotes.com> 1341241048 +0530
committer Anand Doshi <anand@iwebnotes.com> 1341241048 +0530

Merge branch 'master' of github.com:webnotes/erpnext into dev

Conflicts:
	erpnext/selling/doctype/sales_common/sales_common.py