From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 doc/contributions.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2799cd80e4..2a37015b01 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -117,6 +117,7 @@ Farallon Greyskin
 Feep Larsson
 	VWR-447
 	VWR-1314
+	VWR-4444
 Fremont Cunningham
 	VWR-1147
 Gudmund Shepherd
@@ -194,6 +195,7 @@ Michelle2 Zenovka
 	VWR-2652
 	VWR-2834
 	VWR-3749
+	VWR-4506
 Mm Alder
 	VWR-3777
 	VWR-4794
-- 
cgit v1.2.3