# HG changeset patch
# User Magnus Schieder <mschieder@intevation.de>
# Date 1543579002 -3600
# Node ID dbefc648ad71e9951adeee4afb4530bfbb800c2f
# Parent  35ed3247cdc450bfab33124aa5d3e1483d85b6bb# Parent  7cf04ec84eb9c94858050e5689254a262ab94754
Merge

diff -r 35ed3247cdc4 -r dbefc648ad71 CHANGES
--- a/CHANGES	Fri Nov 30 12:51:34 2018 +0100
+++ b/CHANGES	Fri Nov 30 12:56:42 2018 +0100
@@ -1,8 +1,9 @@
 3.2 2018-11-30
 
- * The human_time function calculates up to 59 minutes, not 60.
-   A mistake in porting from Python2 to Python3 made minutes and hours to float.
-   They are now integers again.
+ * Fix human_time() to output one hour instead of 60 minutes. This defect was
+   introduced when porting from Python2 to Python3, because the calculation
+   had implicitly changed from integers to floating point.
+   (Magnus Schieder)
 
  * The time of the currently running entry is cached every minute and after a
    program crash the entry has the description "-no description-".