tree 1c77c0a26a503a64516bc2e77cd50b96108a2a53
parent 401f12418fd7ded3876382dcdc7c3e5e7d5ac1cc
parent 490ae41cee9f439dd5aaf5721ea4831bd5160f87
author Anand Doshi <anand@iwebnotes.com> 1340786614 +0530
committer Anand Doshi <anand@iwebnotes.com> 1340786614 +0530

Merge branch 'master' into dev

Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py