tree 56aab1834f6effb0692b0bba7934a1f127be2559
parent 047442efa20c9407c6bc8534afce317d155c6a1f
parent 72edc3d955d7755623e3fa286fd060b07a509f34
author Anand Doshi <anand@erpnext.com> 1369810854 +0530
committer Anand Doshi <anand@erpnext.com> 1369810854 +0530

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

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	selling/doctype/sales_common/sales_common.py