minor fix in time_diff
Merge branch 'develop' of github.com:frappe/frappe into develop