]> err.no Git - dpkg/commit
Merge branch 'stable'
authorGuillem Jover <guillem@debian.org>
Wed, 23 Jan 2008 07:02:06 +0000 (09:02 +0200)
committerGuillem Jover <guillem@debian.org>
Wed, 23 Jan 2008 07:02:06 +0000 (09:02 +0200)
commit2ce6cb89b93247fcd8b844dcc2c19d3e7a745737
tree6e4c179d3669f7ef80240f11bac0b44ebd6f1e19
parent23857e8a4490d052543937092a73e180637f4917
parent3ee9927c327f1822b3be3c4cc3a2e1065d3f0a3b
Merge branch 'stable'

Conflicts:

configure.ac
debian/changelog
ChangeLog
debian/changelog