tree dbd2373020a5a825f8360fcae8ef6406bd3c0eea
parent edfeade5a646df8139193572325adf33188fd724
parent aa7a386db935fcf519f05101ad1e3d91df1868e9
author Anand Doshi <anand@erpnext.com> 1366128126 +0530
committer Anand Doshi <anand@erpnext.com> 1366128126 +0530

Merge branch 'master' into edge

Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt