aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorOlivier Berger <oberger@ouvaton.org>2011-04-25 22:29:57 +0200
committerOlivier Berger <oberger@ouvaton.org>2011-04-25 22:40:44 +0200
commit55fe213f9b968fc0a909adea57710e3ab7540230 (patch)
treecb24aa4f485958e5a112d671a9b884004eac0825 /README
parentca14175210a0f12ef4802f057d07530a989e82f7 (diff)
downloadbackupninja-55fe213f9b968fc0a909adea57710e3ab7540230.tar.gz
backupninja-55fe213f9b968fc0a909adea57710e3ab7540230.tar.bz2
Fix merge problem
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions