[PATCH 2 of 4] merge

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1421678596 -3600
# Node ID ebf65c2fd007196ba6d45c343af952e96617d237
# Parent  f3e2df6b49bae98facc0c30278bc8a6f61d17d3d
# Parent  ec9a3a4a2c0043b0ee01c2842e0f89906a56f40b
merge

diff -r f3e2df6b49ba -r ebf65c2fd007 .hgtags
--- a/.hgtags	Mon Jan 19 15:42:20 2015 +0100
+++ b/.hgtags	Mon Jan 19 15:43:16 2015 +0100
@@ -46,3 +46,5 @@
 0000000000000000000000000000000000000000 0.9.4
 0000000000000000000000000000000000000000 0.9.4
 c85da02d669e24a7e01dac10a6fb598f90f3d615 0.9.4
+c64b6c56ce96e1b01095bb54bafe23273ab80598 0.9.8
+6ca035ea02ca4292213b9b4d1ab89cdcac1200c0 0.9.9