tree acd860ecda1f38351a1261a6d56d23508e227916
parent 669d15a45c282fe8faa6e95ace7ace68ade1c2d9
parent 26ca2c8c77fd50f6ec02cd26f000c517f7214d15
author Anand Doshi <anand@iwebnotes.com> 1342511515 +0530
committer Anand Doshi <anand@iwebnotes.com> 1342511515 +0530

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

Conflicts:
	erpnext/patches/patch_list.py