my changelog was in conflict, resolving this
authormicah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)
committermicah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)
git-svn-id: http://code.autistici.org/svn/backupninja/trunk@456 758a04ac-41e6-0310-8a23-8373a73cc35d


No differences found