]> err.no Git - dpkg/commit
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731
authorPeter Karlsson <peter@softwolves.pp.se>
Sun, 5 Aug 2007 20:29:21 +0000 (21:29 +0100)
committerPeter Karlsson <peter@softwolves.pp.se>
Sun, 5 Aug 2007 20:29:21 +0000 (21:29 +0100)
commit086325b3214da82c17d5b4cd6c0e79854f99039c
tree877e4144bd300e1945c9a26c2478aa21e47c35cf
parentcdf93f6ddbe5fb702e71e643bfa173546fe580ac
parentc7ebd8b367036dbe5bb5e1d38ff5c0c3deb42ca1
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731

Conflicts:

man/ChangeLog
man/ChangeLog