# 
# patch "ChangeLog"
#  from [765659294791cef398c6a0f72bf2f1ce8baeb8a8]
#    to [69655d7337ed32e5439edf002d3df9149dc7f18e]
# 
===============================================
--- ChangeLog	765659294791cef398c6a0f72bf2f1ce8baeb8a8
+++ ChangeLog	69655d7337ed32e5439edf002d3df9149dc7f18e
@@ -1,5 +1,12 @@
 2005-07-26  Richard Levitte  <address@hidden>
 
+	* sanity.hh, revision.cc (check_sane_history),
+	change_set.cc (concatenate_change_sets, merge_change_sets,
+	invert_change_set): Because boost currently uses the symbol M, we
+	have a clash.  Therefore, let's rename M to MM, for now.
+
+2005-07-26  Richard Levitte  <address@hidden>
+
 	* commands.cc (CMD(privkey)): Change so both the public and
 	private key are printed.