aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-01-29 17:02:03 -0500
committerMicah Anderson <micah@riseup.net>2010-01-29 17:02:03 -0500
commitc1f1baebb5170abb49fb0ec5d6d463d6827bae1b (patch)
treec57da8f9d364097473bd8cc35ed6f13f60959d61 /AUTHORS
parent329e13e35d0bb394c5beed9893b2a869fda6648c (diff)
downloadbackupninja-c1f1baebb5170abb49fb0ec5d6d463d6827bae1b.tar.gz
backupninja-c1f1baebb5170abb49fb0ec5d6d463d6827bae1b.tar.bz2
fix bad upstream merge
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 0 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 30fcc5c..be4e7e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,4 +34,3 @@ Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo opti
stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
-