tree 139cf59bbd33531943f6b4d230c3506582b4e1d0
parent 8867cc238161eb7743972cd313abfd16fc8f6e45
parent 1c36697556df8ed9ac237c1c78f8ff3cc40a13b7
author Anand Doshi <anand@erpnext.com> 1361425183 +0530
committer Anand Doshi <anand@erpnext.com> 1361425183 +0530

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

Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt