# 
# 
# patch "ChangeLog"
#  from [799d62f415fe212cd15ceaa5b33fdc95200df61a]
#    to [fb69a08cd849760aa4fa52e44ff0a0ba2d6d5899]
# 
# patch "netsync.cc"
#  from [6fc9aa8003550eb3351cdeda7a9b8b2abb71eaa4]
#    to [1b80ff0d6f984f2723b60cca060f076c7bbb6c57]
# 
============================================================
--- ChangeLog	799d62f415fe212cd15ceaa5b33fdc95200df61a
+++ ChangeLog	fb69a08cd849760aa4fa52e44ff0a0ba2d6d5899
@@ -1,3 +1,8 @@
+2006-01-25  Matthew Gregan  <address@hidden>
+
+	* netsync.cc (session::rebuild_merkle_trees): Ticker header
+	consistency tweak.
+
 2005-01-25  Matt Johnston  <address@hidden>
 
 	* HACKING: add some notes about compiling - precompiled headers,
============================================================
--- netsync.cc	6fc9aa8003550eb3351cdeda7a9b8b2abb71eaa4
+++ netsync.cc	1b80ff0d6f984f2723b60cca060f076c7bbb6c57
@@ -2705,7 +2705,7 @@
   // xgettext: please use short message and try to avoid multibytes chars
   ticker revisions_ticker(_("revisions"), "r", 64);
   // xgettext: please use short message and try to avoid multibytes chars
-  ticker certs_ticker(_("certs"), "c", 256);
+  ticker certs_ticker(_("certificates"), "c", 256);
   // xgettext: please use short message and try to avoid multibytes chars
   ticker keys_ticker(_("keys"), "k", 1);