Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Wed, 25 Feb 2009 06:14:55 +0000 (23:14 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 25 Feb 2009 06:14:55 +0000 (23:14 -0700)
commitd3daaa199aca7497bb507f92b693c8457353f96a
treef8cb2245ab8e83c45de18f8a245db176182e1cb8
parent01e54b91809c75d91ebaefacc7481f4872a8fac2
parentc286dbf484dc985fb63d5c677fc8cd91b5b1d0f6
Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
cleanup-script.sh
tests/incremental.at
cleanup-script.sh
src/create.c
src/list.c
tests/incremental.at