From b302f15deea0f4f7f5de75bfd3776c17021b6444 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 1 Feb 2008 02:23:35 +0000
Subject: EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release ACTUAL
 MERGE: merge maint-viewer-3-merge -r 79051 -> release

---
 doc/contributions.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 03a76a92fa..4dea768d28 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -52,6 +52,8 @@ Boroondas Gupte
 bushing Spatula
 	VWR-119
 	VWR-424
+Carjay McGinnis
+	VWR-3737
 Catherine Pfeffer
 	VWR-1282
 Dale Glass
@@ -166,6 +168,8 @@ McCabe Maxsted
 Michelle2 Zenovka
 	VWR-2652
 	VWR-2834
+Mm Alder
+	VWR-3777
 Mr Greggan
 	VWR-445
 Nicholaz Beresford
@@ -175,6 +179,7 @@ Nicholaz Beresford
 	VWR-349
 	VWR-353
 	VWR-364
+	VWR-374
 	VWR-546
 	VWR-691
 	VWR-727
-- 
cgit v1.2.3