# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1392293330 -3600
# Node ID da64679bfc8a761cacb5976efba411362c8bc51e
# Parent  80628d4069be724089ea487a300d62f4cbd8970d# Parent  4e41b2fe46ccfb9722e51e23902f7019d286b15d
merge with stable

diff -r 80628d4069be -r da64679bfc8a mercurial/help/config.txt
--- a/mercurial/help/config.txt	Fri Jan 31 01:12:35 2014 -0800
+++ b/mercurial/help/config.txt	Thu Feb 13 13:08:50 2014 +0100
@@ -748,7 +748,7 @@
 For example::
 
     [hostfingerprints]
-    hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d
+    hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0
 
 This feature is only supported when using Python 2.6 or later.