]> err.no Git - dpkg/commit
Merge commit 'err.no/master' master
authorTollef Fog Heen <tfheen@err.no>
Mon, 10 Mar 2008 17:00:44 +0000 (18:00 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 10 Mar 2008 17:00:44 +0000 (18:00 +0100)
commit690e02ad66a9388303e889b2663b419172e250c4
tree188832d4d0e996a0ba8f66024eb51e76d9d99e1d
parenta4a633c1562bc258851e57e8c78ecc1429feae85
parentb7c2a347bc704e409807d81d0a190c5220d896e6
Merge commit 'err.no/master'

Conflicts:

src/archives.c