From c8607be10ef629212204c4ab256641a9d53c0299 Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 13 Jul 2010 23:01:50 -0700
Subject: [PATCH] docs: CREDITS and NEWS

---
 CREDITS | 12 +++++++++---
 NEWS    |  5 +++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CREDITS b/CREDITS
index 5f8f7475..2f298e35 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,6 @@
-    This is at least a partial credits-file of people that have contributed to
+    This is at least a partial credits-file of people that have contributed to
 the Tahoe project.  It is formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), 
+beautification by scripts.  The fields are: name (N), email (E),
 web-address (W), PGP key ID and fingerprint (P), description (D), and
 snail-mail address (S).
 
@@ -86,7 +86,7 @@ D: patch Makefile to build .debs for Ubuntu Intrepid
 
 N: Kevan Carstensen
 E: kevan@isnotajoke.com
-D: optimize mutable files and directories, safer "tahoe mv", code review, docs
+D: servers of happiness, other improvements, code review, docs
 
 N: Marc Tooley
 W: http://rune.ca
@@ -112,3 +112,9 @@ D: Ubuntu packaging, usability testing
 
 N: Jeremy Fitzhardinge
 D: better support for HTTP range queries
+
+N: Frédéric Marti
+E: freestorm77@gmail.com
+P: 0xD703AE08, F1 82 35 BB FF D8 96 0B 68 E2  91 2F C4 B8 6A 42 D7 03 AE 08
+S: Lausanne - Switzerland
+D: fix layout issue and server version numbers in WUI
diff --git a/NEWS b/NEWS
index ff2a2b59..3110d783 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-User visible changes in Tahoe-LAFS.  -*- outline; coding: utf-8 -*-
+User visible changes in Tahoe-LAFS.  -*- outline; coding: utf-8 -*-
 
 * Release 1.7.1 (2010-07-17)
 
@@ -6,8 +6,9 @@ User visible changes in Tahoe-LAFS.  -*- outline; coding: utf-8 -*-
 
  - Fix rarely-encountered incompatibility between Twisted logging utility and
    the new unicode support added in v1.7.0 (#1099)
- - Fix minor layout issue in the Web User Interface with Internet Explorer 
+ - Fix minor layout issue in the Web User Interface with Internet Explorer
    (#1097)
+ - Fix bug where server version number was always 0 on the welcome page (#1067)
 
 * Release 1.7.0 (2010-06-18)
 
-- 
2.45.2