tree bf2e9dd33e54f8955460bf0a04a628ca18c1063a
parent 946442d7a5b0cfc7c5c5abbc6fdfc323f2f5193a
parent 3ee4f9a90e90889d1daa15c7a1097c1e54900db1
author Anand Doshi <anand@erpnext.com> 1357115556 +0530
committer Anand Doshi <anand@erpnext.com> 1357115556 +0530

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

Conflicts:
	patches/patch_list.py