tree 72e6d509751c4ab805261dc75333e0ef8ebdfeeb
parent d3d3472af5d8af97c89c980fbf614dc38ba6e988
parent e53a81dceacbd20375276c068c2f05666ca8d72c
author Anand Doshi <anand@erpnext.com> 1370858107 +0530
committer Anand Doshi <anand@erpnext.com> 1370858107 +0530

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

Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py