From 5c7a26f70d0d899e99f3680e25e643e232502955 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 26 Dec 2010 18:56:33 +0100
Subject: Update ChangeLog and authors.

---
 AUTHORS   | 2 +-
 ChangeLog | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 9202931..ccd8b39 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,7 @@ Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature
 dan@garthwaite.org -- reportspace bugfix
 Tuomas Jormola <tj@solitudo.net> -- "when = manual" option
 Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix, dup helper fix
-Olivier Berger <oberger@ouvaton.org> -- much work on the dup handler
+Olivier Berger <oberger@ouvaton.org> -- numerous contributions
 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
diff --git a/ChangeLog b/ChangeLog
index 03f227b..276467e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 version 0.9.9 -- UNRELEASED
+    backupninja changes
+	 . Use locking to avoid running concurrent instances of the same backup
+	   action. Thanks to Olivier Berger <oberger@ouvaton.org> for the patch.
+	   (Closes: #511300)
     handler changes
 	dup:
 	 . Use --tempdir option rather than TMPDIR environment variable.
-- 
cgit v1.2.3