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)
commitc5faa69830f20d1ae85abc0f26aba684c8f64f7c
tree86428783c4a5a0fa3ccd4e1811b837af21126f8e
parent025aece21dacfb1b0731ab8a0d967fe7cec66e5d
my changelog was in conflict, resolving this

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@456 758a04ac-41e6-0310-8a23-8373a73cc35d
ChangeLog