]> err.no Git - dpkg/commit
Merge branch 'stable'
authorRaphael Hertzog <hertzog@debian.org>
Mon, 14 Apr 2008 16:22:47 +0000 (18:22 +0200)
committerRaphael Hertzog <hertzog@debian.org>
Mon, 14 Apr 2008 16:22:47 +0000 (18:22 +0200)
commitaa07e33e6f6026af87436c7e7af013baa973f17e
tree7e8d550bc2e816e50cc94b0b56ea541264c872c7
parentb831f8199bf59968693f0ac13bed02edc3ef58b3
parent639d515a217ca2202b50ced736ce16478a7312cc
Merge branch 'stable'

Drop changelog entry for the unreleased version 1.14.18.1.

Conflicts:

ChangeLog
debian/changelog
ChangeLog
debian/changelog