From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Mon, 7 Nov 2005 16:57:11 +0000 (-0700)
Subject: Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
X-Git-Tag: release-0.4~22
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/x.gif?a=commitdiff_plain;h=2627a2ef3b9a158282133c143a417d99de4b2d66;hp=dfc5b1eaf91ee5ddb9499616ab8a1439c15ab905;p=backups%2F.git

Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
---

diff --git a/TODO b/TODO
index 8149c64..2ecc614 100644
--- a/TODO
+++ b/TODO
@@ -12,3 +12,4 @@ copy and actually preserve the hard-links.  This will save space and
 make restore more accurate since the hard-links will still be there
 after the restore.
 
+Alan was here