tree 28bdec149d99df8bd1b2cc54788ae496e6022c5d
parent 0cfdeec218d397f156ee0f76ffda212dc9f2f92e
parent bf4ef36341bf5693a11e29af31ba671c0a445bd2
author Anand Doshi <anand@erpnext.com> 1360993177 +0530
committer Anand Doshi <anand@erpnext.com> 1360993177 +0530

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

Conflicts:
	patches/patch_list.py