tree 7ad56ce7e665546582ef9ede5ef1fb180f3236f8
parent eda17eb20a7808f24faae12b612e40f101059557
parent 7ee7eae3ae8848eb597bcab6557dc278fbb6784b
author Anand Doshi <anand@erpnext.com> 1367229210 +0530
committer Anand Doshi <anand@erpnext.com> 1367229210 +0530

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

Conflicts:
	patches/patch_list.py