changelog merge

diff --git a/ChangeLog b/ChangeLog
index bbb9341a50fa09dc4fa761fa7ff5ef2ca91d102b..60c3bade3717251458f115b94e852d6189745682 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-01-22  Seth Vidal <skvidal@fedoraproject.org>
+
+       * createrepo.spec, createrepo/__init__.py: 0.9.3
+
+2008-01-22  Seth Vidal <skvidal@fedoraproject.org>
+
+       * createrepo/__init__.py, createrepo/yumbased.py, genpkgmetadata.py: 
+       add changelog-limit option to restrict the number of changelogs we
+       add, by default
+
+2008-01-17  Seth Vidal <skvidal@fedoraproject.org>
+
+       * genpkgmetadata.py: make sure empty directories still work
+
+2008-01-17  Seth Vidal <skvidal@fedoraproject.org>
+
+       * ChangeLog: update changelog
+
 2008-01-17  Seth Vidal <skvidal@fedoraproject.org>
 
        * createrepo/__init__.py: comment out a debug print