[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1519902667 -3600
# Node ID 8096dc2afb945683b81db2148d716b9b040c1893
# Parent  61255b610929f27bc71d40befd2f25c3deb71112
# Parent  5849f59e7065cf83a9f862bf35b8dd250eb2ef0c
Merge

diff -r 61255b610929 -r 8096dc2afb94 .hgtags
--- a/.hgtags	Thu Mar 01 12:08:06 2018 +0100
+++ b/.hgtags	Thu Mar 01 12:11:07 2018 +0100
@@ -73,3 +73,4 @@
 8bf00b8266fe8dc3181997d3dc8d3f417ee1c161 3.1.10
 0e3ecf7cd461d69e83c1a777ac368d9d4b7217ae 3.2.0
 266b599a481911cc7428a5a8904a7d47170aac88 3.2.1
+e781b847fdca562185fc23e5444b25dfbb50dfc1 3.2.2