# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1392327204 21600
# Node ID d0bca0649c7f554d42ceb7e24448dbba663821a8
# Parent  7b5ec1c7e8e29d063b8bab5f93e5a69bdd8a2bb7# Parent  da64679bfc8a761cacb5976efba411362c8bc51e
merge with crew

diff -r 7b5ec1c7e8e2 -r d0bca0649c7f mercurial/help/config.txt
--- a/mercurial/help/config.txt	Fri Jan 31 01:39:59 2014 -0800
+++ b/mercurial/help/config.txt	Thu Feb 13 15:33:24 2014 -0600
@@ -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.