From: Micah Anderson <micah@riseup.net>
Date: Wed, 1 Nov 2006 21:40:46 +0000 (+0000)
Subject: my changelog was in conflict, resolving this
X-Git-Tag: backupninja-0.9.5~53
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=0f46b775b9ef027abe15a974395d111a83f29ef3;hp=0f46b775b9ef027abe15a974395d111a83f29ef3;p=matthijs%2Fupstream%2Fbackupninja.git

my changelog was in conflict, resolving this
---