From 1787cf1c21815db891dc2474a9dab3f6645c1c21 Mon Sep 17 00:00:00 2001
From: Greg Smith <greg@2ndQuadrant.com>
Date: Thu, 10 Feb 2011 15:19:00 -0500
Subject: [PATCH] Update credits and history to reflect recent merges

---
 CREDITS | 3 +++
 HISTORY | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index f8b33cd4..86b8dea1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -5,3 +5,6 @@ Simon Riggs <simon@2ndQuadrant.com>
 Greg Smith <greg@2ndQuadrant.com>
 Robert J. Noles <rj@2ndQuadrant.com>
 Gabriele Bartolini <gabriele@2ndQuadrant.com>
+Bas van Oostveen <v.oostveen@gmail.com>
+Hannu Krosing <hannu@2ndQuadrant.com>
+Cédric Villemain <cedric@2ndquadrant.fr>
diff --git a/HISTORY b/HISTORY
index bbeada88..9bcaae04 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,8 @@
 1.0.0 2010-12-05 First public release
 
-1.0.1 2010-12-XX Fix missing "--force" option in help
+1.0.1 2011-02-XX Fix missing "--force" option in help
+               	 Correct warning message for wal_keep_segments (Bas van Oostveen)
+                 Add Debian build/usage docs (Bas, Hannu Krosing, Cedric Villemain)
+                 Add Debian .deb packaging (Hannu)
+                 Move configuration data into a structure (Bas)
+                 Make rsync options configurable (Bas)