From 8ed056fde9fe5fc9755158013a5cb8be73066e2c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Sat, 20 Jun 2009 09:17:56 +0000
Subject: svn merge -r124872:124873
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a

QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
---
 doc/contributions.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 31ea1bbc5b..28c41debe7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -197,6 +197,7 @@ Feep Larsson
 	VWR-4444
 Flemming Congrejo
 	CT-193
+	CT-318
 Fluf Fredriksson
 	VWR-3450
 Fremont Cunningham
@@ -350,6 +351,7 @@ Michelle2 Zenovka
 Mm Alder
 	VWR-3777
 	VWR-4794
+	VWR-13578
 Mr Greggan
 	VWR-445
 Nicholaz Beresford
-- 
cgit v1.3