1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a2ba818..de714a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-03  Clark Williams  <williams@redhat.com>
+	
+	* mock.py, Makefile, etc/*.cfg
+	merged BZ fixes from mock-0.6 branch
+	
 2006-09-08  Clark Williams  <williams@redhat.com>
 
 	* mock.c
@@ -118,6 +123,7 @@
 
 	* etc/defaults.cfg: use defaults more intelligently
 
+
 2006-05-24 11:15  skvidal
 
 	* mock.py, src/mock-helper.c: