[Getan-commits] [PATCH 3 of 6] Merge

[Wald Commits]

# HG changeset patch
# User Magnus Schieder <mschieder at intevation.de>
# Date 1543578600 -3600
# Node ID e30fef63f1ede08f78e3e6f4b0899c820f52c425
# Parent  9d8b317123806db74dc4f27d4b425b894de6b2df
# Parent  9dc72bf6d6d2a7435ef36317e25cf060d607d40f
Merge

diff -r 9d8b31712380 -r e30fef63f1ed .hgtags
--- a/.hgtags	Tue Nov 06 13:19:06 2018 +0100
+++ b/.hgtags	Fri Nov 30 12:50:00 2018 +0100
@@ -18,3 +18,4 @@
 1b6509e51b93f20197a5a5afc3ebf047785206ec 3.1
 1b6509e51b93f20197a5a5afc3ebf047785206ec 3.1
 bb08400729fb4d38976483c4d171f789b468d9a4 3.1
+f8099adc30f2835005aef2eb7062a998dd3e6e56 3.2
diff -r 9d8b31712380 -r e30fef63f1ed CHANGES
--- a/CHANGES	Tue Nov 06 13:19:06 2018 +0100
+++ b/CHANGES	Fri Nov 30 12:50:00 2018 +0100
@@ -1,4 +1,4 @@
-3.x 20xx-xx-xx UNRELEASED
+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.
diff -r 9d8b31712380 -r e30fef63f1ed getan/__init__.py
--- a/getan/__init__.py	Tue Nov 06 13:19:06 2018 +0100
+++ b/getan/__init__.py	Fri Nov 30 12:50:00 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__)