From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Wed, 1 Nov 2006 21:40:46 +0000 (+0000)
Subject: my changelog was in conflict, resolving this
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=c5faa69830f20d1ae85abc0f26aba684c8f64f7c;hp=c5faa69830f20d1ae85abc0f26aba684c8f64f7c;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

my changelog was in conflict, resolving this


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