Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Mon, 1 Nov 2010 23:29:19 +0000 (17:29 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 1 Nov 2010 23:29:19 +0000 (17:29 -0600)
commitde7372b23c3da92fbfaea2d1ac592f0b2ba87914
treeb930b712f535eeff95cf562b472e746e8b3dd4b1
parentfbbfb9406a82e647ce27b6462b11a802fa48f31a
parentb414e25de8ca49d7567a92c203d431383ec57c83
Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
build-aux/config.guess
build-aux/config.sub
rmt/rmt.c
src/extract.c
tests/testsuite
debian/changelog
rmt/rmt.c
src/list.c