Merge branch 'dfsg-orig' into dfsg-debian debian/1.26-1
authorBdale Garbee <bdale@gag.com>
Wed, 17 Aug 2011 19:17:19 +0000 (12:17 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 17 Aug 2011 19:17:19 +0000 (12:17 -0700)
commitbc973a082dddfe8c66baf7352df0433f83479ce1
tree8c70ac2dadca93d151899ddb53b70fdf2fdec3ff
parent41869b9c269393778bd072c04d369091f41c10d0
parentf3797c1231154dc0bbade50aceaa8639ffd9e3cf
Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
src/extract.c
debian/changelog