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?p=matthijs%2Fupstream%2Fbackupninja.git;a=commitdiff_plain;h=0f46b775b9ef027abe15a974395d111a83f29ef3

my changelog was in conflict, resolving this
---

diff --git a/ChangeLog b/ChangeLog
index 12385a0..203209a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ version 0.9.5 -- unreleased
 	sys:
 	 . Fixed typo breaking things for VServers.
 	 . Fix bug when vrootdir is on its own partition (Closes: #395928)
+	rub
+	 . Fixed typo in rub handler that caused it to not work
 	 . Better sfdisk error and output handling: should now properly warn
 	   when it does not manage to backup a partition table, and shut up when
 	   it succeeds (Closes: #396632)