tree d1988472885334a9a5ebe28477611cf9e64f1fd3
parent d5d39ac5ec0494f9672da5d5bd3711f607607eb3
parent 90d74d4bfa2a2822b16f61d0bc8eb2324ee0f1ac
author Anand Doshi <anand@erpnext.com> 1375084860 +0530
committer Anand Doshi <anand@erpnext.com> 1375084860 +0530

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

Conflicts:
	patches/patch_list.py