tree 22fabf31cef1b171c0d98266fdea970d81389951
parent 68196bc96609d2ddbb474f1cd5cca4204ae38a8e
parent 0b0600498686dca621e218a839209d7d1133b40b
author Anand Doshi <anand@iwebnotes.com> 1340693429 +0530
committer Anand Doshi <anand@iwebnotes.com> 1340693429 +0530

Merge branch 'master' into dev

Conflicts:
	erpnext/patches/patch_list.py