tree b687c5520bf387391dedda8ba879699649407ee7
parent 1e820f352ebcd8ac28790018a7cc0bff80cca8f6
parent 11d311376eb4b18572a7ae2dedfe9adb617002a5
author Anand Doshi <anand@erpnext.com> 1371453905 +0530
committer Anand Doshi <anand@erpnext.com> 1371453905 +0530

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

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