X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=6ead2fe8e9aecfb1b163530c6f70a908fdba3441;hb=2464bbfa7a6b82eca7bf3f7d517515ed462f1b23;hp=06eba5e9bf3cea5fc6fc7921f02f86a66e087f23;hpb=9c9af489440fbc63e4c5eeb21b21aa5aa4520394;p=gnulib.git

diff --git a/ChangeLog b/ChangeLog
index 06eba5e9b..6ead2fe8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-02  Paolo Bonzini  <bonzini@gnu.org>
 
+	* build-aux/bootstrap: Install git-merge-changelog configuration
+	items into .gitconfig if needed.
+
+2008-10-02  Paolo Bonzini  <bonzini@gnu.org>
+
 	* build-aux/bootstrap: Recognize `gnulib' being a submodule in a
 	git repository, and initialize/update it accordingly.