From abdc99f21b542c4fea67030ddbd7166c9d1c6c63 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 18 Feb 2009 21:10:16 +0000
Subject: Merge of QAR-1267 to trunk.  This was a combo merge of QAR-1175
 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
---
 doc/contributions.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1fcfb82738..b66298371c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -108,6 +108,9 @@ Carjay McGinnis
 Catherine Pfeffer
 	VWR-1282
 	VWR-8624
+Celierra Darling
+	VWR-1274
+	VWR-6975
 Dale Glass
 	VWR-120
 	VWR-560
@@ -375,6 +378,7 @@ Renault Clio
 	VWR-1976
 Robin Cornelius
 	VWR-2488
+	VWR-9557
 Ryozu Kojima
 	VWR-287
 Sammy Frederix
-- 
cgit v1.2.3