# HG changeset patch # User Magnus Schieder # Date 1543579002 -3600 # Node ID dbefc648ad71e9951adeee4afb4530bfbb800c2f # Parent 35ed3247cdc450bfab33124aa5d3e1483d85b6bb# Parent 7cf04ec84eb9c94858050e5689254a262ab94754 Merge diff -r 7cf04ec84eb9 -r dbefc648ad71 .hgtags --- a/.hgtags Mon Nov 19 11:24:11 2018 +0100 +++ b/.hgtags Fri Nov 30 12:56:42 2018 +0100 @@ -18,3 +18,6 @@ 1b6509e51b93f20197a5a5afc3ebf047785206ec 3.1 1b6509e51b93f20197a5a5afc3ebf047785206ec 3.1 bb08400729fb4d38976483c4d171f789b468d9a4 3.1 +f8099adc30f2835005aef2eb7062a998dd3e6e56 3.2 +f8099adc30f2835005aef2eb7062a998dd3e6e56 3.2 +e30fef63f1ede08f78e3e6f4b0899c820f52c425 3.2 diff -r 7cf04ec84eb9 -r dbefc648ad71 CHANGES --- a/CHANGES Mon Nov 19 11:24:11 2018 +0100 +++ b/CHANGES Fri Nov 30 12:56:42 2018 +0100 @@ -1,4 +1,4 @@ -3.x 20xx-xx-xx UNRELEASED +3.2 2018-11-30 * Fix human_time() to output one hour instead of 60 minutes. This defect was introduced when porting from Python2 to Python3, because the calculation diff -r 7cf04ec84eb9 -r dbefc648ad71 getan/__init__.py --- a/getan/__init__.py Mon Nov 19 11:24:11 2018 +0100 +++ b/getan/__init__.py Fri Nov 30 12:56:42 2018 +0100 @@ -6,5 +6,5 @@ # This is Free Software licensed under the terms of GPLv3 or later. # For details see LICENSE coming with the source of 'getan'. -__version_info__ = ("3", "1" "dev1") +__version_info__ = ("3", "2") __version__ = '.'.join(__version_info__)