From c5faa69830f20d1ae85abc0f26aba684c8f64f7c Mon Sep 17 00:00:00 2001
From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Wed, 1 Nov 2006 21:40:46 +0000
Subject: [PATCH] my changelog was in conflict, resolving this

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@456 758a04ac-41e6-0310-8a23-8373a73cc35d
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

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)
-- 
2.30.2