tree 8d192b23c68af34af10a61564db26fde344790b7
parent 06c105086303637d874f8df7bd25d68109810cd9
parent 5f72836f11ebec3cbcb4babc64965abd7a05cd6e
author Anand Doshi <anand@iwebnotes.com> 1326956670 +0530
committer Anand Doshi <anand@iwebnotes.com> 1326956670 +0530

Merge branch 'stable' into latest

Conflicts:
	erpnext/patches/patch_list.py