From e188badaf29a1a02307f93864eed6737096bd9a1 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Tue, 3 Feb 2009 17:56:26 +0000
Subject: QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
---
 doc/contributions.txt | 59 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index fb3f7ea466..2b0d3abd9e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -29,6 +29,9 @@ Aimee Trescothick
 	VWR-9255
 Alejandro Rosenthal
 	VWR-1184
+Aleric Inglewood
+	VWR-10759
+	VWR-10837
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -50,23 +53,25 @@ Alissa Sabre
 	VWR-1351
 	VWR-1353
 	VWR-1410
+        VWR-1843
 	VWR-2116
 	VWR-2826
 	VWR-3290
+	VWR-3410
 	VWR-3857
 	VWR-4010
-	VWR-3410
+	VWR-5575
+        VWR-5929
+        VWR-6384
+        VWR-6385
 	VWR-6386
-	VWR-6384
-	VWR-6385
-	VWR-5929
-	VWR-6430
-	VWR-1843
-	VWR-6668
-	VWR-7153
-	VWR-7168
-	VWR-7087
-	VWR-7086
+        VWR-6430
+	VWR-6858
+        VWR-6668
+        VWR-7086
+        VWR-7087
+        VWR-7153
+        VWR-7168
 	VWR-9190
 	VWR-10728
 Angus Boyd
@@ -193,7 +198,6 @@ Hiro Sommambulist
 	VWR-97
 	VWR-100
 	VWR-105
-	VWR-108
 	VWR-118
 	VWR-132
 	VWR-136
@@ -219,9 +223,13 @@ Kage Pixel
 	VWR-11
 Kerutsen Sellery
 	VWR-1350
+Khyota Wulluf
+	VWR-9256
 Kunnis Basiat
 	VWR-82
 	VWR-102
+Lockhart Cordoso
+	VWR-108
 maciek marksman
 	CT-86
 march Korda
@@ -235,11 +243,13 @@ Matthew Dowd
 McCabe Maxsted
 	VWR-1318
 	VWR-4065
+	VWR-4826
 	VWR-7827
 	VWR-7877
 	VWR-7893
 	VWR-8080
 	VWR-8689
+	VWR-9007
 Michelle2 Zenovka
 	VWR-2652
 	VWR-2662
@@ -254,6 +264,7 @@ Michelle2 Zenovka
 	VWR-7831
 	VWR-8889
 	VWR-8310
+	VWR-9499
 Mm Alder
 	VWR-3777
 	VWR-4794
@@ -351,6 +362,8 @@ Peekay Semyorka
 	VWR-19
 	VWR-49
 	VWR-79
+Peter Lameth
+	VWR-7331
 princess niven
 	VWR-5733
         CT-85
@@ -378,6 +391,7 @@ SignpostMarv Martin
 	VWR-155
 	VWR-218
 	VWR-373
+	VWR-8357
 Simon Nolan
 	VWR-409
 SpacedOut Frye
@@ -436,15 +450,36 @@ Whoops Babii
 	VWR-631
 	VWR-1640
 	VWR-3340
+	VWR-4800
+	VWR-4802
+	VWR-4804
+	VWR-4805
+	VWR-4806
+	VWR-4808
+	VWR-4809
+	VWR-4811
+	VWR-4815
+	VWR-4816
+	VWR-4818
 	VWR-5659
+	VWR-8291
+	VWR-8292
+	VWR-8293
+	VWR-8294
+	VWR-8295
+	VWR-8296
+	VWR-8297
+	VWR-8298
 Wilton Lundquist
 	VWR-7682
 Zarkonnen Decosta
 	VWR-253
 Zi Ree
+	VWR-423
 	VWR-671
 	VWR-682
 	VWR-684
+	VWR-9127
 	VWR-1140
 Zipherius Turas
 	VWR-76
-- 
cgit v1.2.3