# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1383560762 -3600
# Node ID e4eb85fbcec4fc20d5af584db946ef2dc80654be
# Parent  69138ab4a94200bbc4cae7be650e76d0c3786fcd# Parent  969afcc1ca26a02dab7f61eba66afbd9b650ae96
Merged

diff -r 969afcc1ca26 -r e4eb85fbcec4 .hgtags
--- a/.hgtags	Mon Nov 04 11:24:02 2013 +0100
+++ b/.hgtags	Mon Nov 04 11:26:02 2013 +0100
@@ -69,6 +69,5 @@
 84b1e87e86692db4202c5d68e0c521185ef0f9d2 3.0.14
 a18a4376479383d7b6233bfa2d27737c8686c90a 3.0.15
 12248d9eb326472adc2a8824989dc4a52197f7cc 3.0.16
-e97867879a45de45fd631d7aca5fed39612934d2 3.0.17
-e97867879a45de45fd631d7aca5fed39612934d2 3.0.17
 0000000000000000000000000000000000000000 3.0.17
+607246315009e10fbc6814827769c0a53259948a 3.0.17