EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 211 insertions, 46 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index b7d15b5ff5..2f8188f2c4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -4,49 +4,214 @@ along with the issue identifier corresponding to the patches we've
 received from them.  To see more about these contributions, visit
 http://jira.secondlife.com/ and enter the issue identifier.
 
-Able Whitman - VWR-650, VWR-1460
-Alissa Sabre - VWR-81, VWR-83, VWR-171, VWR-251, VWR-414, VWR-415, VWR-459, VWR-606, VWR-652, VWR-1351, VWR-1410
-Argent Stonecutter - VWR-68
-Benja Kepler - VWR-746
-Blakar Ogre - VWR-881
-blino Nakamura - VWR-17
-bushing Spatula - VWR-424, VWR-119
-Catherine Pfeffer - VWR-1282
-Dale Glass - VWR-120, VWR-560
-Drewan Keats - VWR-28, VWR-248, VWR-412
-Dylan Haskell - VWR-72
-Dzonatas Sol - VWR-198, VWR-878, VWR-1704, VWR-1705, VWR-1729, VWR-975
-Eddy Stryker - VWR-15, VWR-23, VWR-1468
-EponymousDylan Ra - VWR-1465
-Feep Larsson - VWR-1314
-Fremont Cunningham - VWR-1147
-Gigs Taggart - VWR-71, VWR-326, VWR-1217, VWR-1434
-Ginko Bayliss - VWR-4
-Grazer Kline - VWR-1092
-Gudmund Shepherd - VWR-1594
-Hikkoshi Sakai - VWR-429
-Hiro Sommambulist - VWR-66, VWR-97, VWR-100, VWR-105, VWR-108, VWR-118, VWR-132, VWR-136, VWR-143
-Iskar Ariantho - VWR-1223
-Jacek Antonelli - VWR-165, VWR-188, VWR-427, VWR-597
-Joghert LeSabre - VWR-64
-Kage Pixel - VWR-11
-Kunnis Basiat - VWR-82
-McCabe Maxsted - VWR-1318
-Nicholaz Beresford - VWR-132, VWR-176, VWR-364, VWR-691, VWR-793, VWR-794, VWR-802, VWR-803, VWR-804, VWR-805, VWR-808, VWR-809, VWR-810, VWR-823, VWR-856, VWR-869, VWR-870, VWR-871, VWR-873, VWR-908, VWR-966, VWR-1221, VWR-1270, VWR-1296, VWR-1410, VWR-1418, VWR-1453, VWR-1455, VWR-1470, VWR-1578, VWR-1626, VWR-1655, VWR-1698, VWR-1706, VWR-1723, VWR-1732, VWR-1861
-Paul Churchill - VWR-20
-Paula Innis - VWR-30, VWR-1049
-Peekay Semyorka - VWR-7, VWR-19, VWR-49, VWR-79
-Ryozu Kojima - VWR-287
-SignpostMarv Martin - VWR-154, VWR-155
-Simon Nolan - VWR-409
-SpacedOut Frye - VWR-57, VWR-94, VWR-121, VWR-123, VWR-1823
-Stevex Janus - VWR-1182
-Still Defiant - VWR-207, VWR-446
-Strife Onizuka - SVC-9, VWR-74, VWR-85, VWR-148
-tenebrous pau - VWR-247
-TBBle Kurosawa - VWR-938, VWR-941, VWR-944, VWR-945
-Tharax Ferraris - VWR-605
-Thraxis Epsilon - VWR-383, SVC-371
-Whoops Babii - VWR-1640
-Zi Ree - VWR-671, VWR-682, VWR-1140
-Zipherius Turas - VWR-76, VWR-77
+Able Whitman
+	VWR-650
+	VWR-1460
+Alissa Sabre
+	VWR-81
+	VWR-83
+	VWR-171
+	VWR-251
+	VWR-414
+	VWR-415
+	VWR-459
+	VWR-606
+	VWR-652
+	VWR-1351
+	VWR-1410
+Argent Stonecutter
+	VWR-68
+Benja Kepler
+	VWR-746
+Blakar Ogre
+	VWR-881
+blino Nakamura
+	VWR-17
+bushing Spatula
+	VWR-119
+	VWR-424
+Catherine Pfeffer
+	VWR-1282
+Dale Glass
+	VWR-120
+	VWR-560
+Drewan Keats
+	VWR-28
+	VWR-248
+	VWR-412
+Dylan Haskell
+	VWR-72
+Dzonatas Sol
+	VWR-198
+	VWR-878
+	VWR-975
+	VWR-1704
+	VWR-1705
+	VWR-1729
+Eddy Stryker
+	VWR-15
+	VWR-23
+	VWR-1468
+EponymousDylan Ra
+	VWR-1465
+Feep Larsson
+	VWR-1314
+Fremont Cunningham
+	VWR-1147
+Gigs Taggart
+	VWR-71
+	VWR-326
+	VWR-493
+	VWR-1217
+	VWR-1434
+	VWR-1987
+Ginko Bayliss
+	VWR-4
+Grazer Kline
+	VWR-1092
+Gudmund Shepherd
+	VWR-1594
+Hikkoshi Sakai
+	VWR-429
+Hiro Sommambulist
+	VWR-66
+	VWR-97
+	VWR-100
+	VWR-105
+	VWR-108
+	VWR-118
+	VWR-132
+	VWR-136
+	VWR-143
+Iskar Ariantho
+	VWR-1223
+Jacek Antonelli
+	VWR-165
+	VWR-188
+	VWR-427
+	VWR-597
+Joghert LeSabre
+	VWR-64
+Kage Pixel
+	VWR-11
+Kunnis Basiat
+	VWR-82
+Matthew Dowd
+	VWR-1344
+	VWR-1736
+	VWR-1761
+McCabe Maxsted
+	VWR-1318
+Mr Greggan
+	VWR-445
+Nicholaz Beresford
+	VWR-132
+	VWR-176
+	VWR-364
+	VWR-546
+	VWR-691
+	VWR-793
+	VWR-794
+	VWR-802
+	VWR-803
+	VWR-804
+	VWR-805
+	VWR-808
+	VWR-809
+	VWR-810
+	VWR-823
+	VWR-856
+	VWR-869
+	VWR-870
+	VWR-871
+	VWR-873
+	VWR-908
+	VWR-966
+	VWR-1221
+	VWR-1230
+	VWR-1270
+	VWR-1296
+	VWR-1410
+	VWR-1418
+	VWR-1453
+	VWR-1455
+	VWR-1470
+	VWR-1566
+	VWR-1578
+	VWR-1626
+	VWR-1655
+	VWR-1698
+	VWR-1706
+	VWR-1721
+	VWR-1723
+	VWR-1732
+	VWR-1769
+	VWR-1808
+	VWR-1826
+	VWR-1861
+	VWR-1872
+	VWR-1968
+	VWR-2152
+Paul Churchill
+	VWR-20
+	VWR-493
+	VWR-749
+	VWR-1567
+	VWR-1647
+	VWR-1880
+Paula Innis
+	VWR-30
+	VWR-1049
+Peekay Semyorka
+	VWR-7
+	VWR-19
+	VWR-49
+	VWR-79
+Renault Clio
+	VWR-1976
+Ryozu Kojima
+	VWR-287
+SignpostMarv Martin
+	VWR-154
+	VWR-155
+Simon Nolan
+	VWR-409
+SpacedOut Frye
+	VWR-57
+	VWR-94
+	VWR-121
+	VWR-123
+	VWR-1823
+Stevex Janus
+	VWR-1182
+Still Defiant
+	VWR-207
+	VWR-446
+Strife Onizuka
+	SVC-9
+	VWR-74
+	VWR-85
+	VWR-148
+tenebrous pau
+	VWR-247
+TBBle Kurosawa
+	VWR-938
+	VWR-941
+	VWR-942
+	VWR-944
+	VWR-945
+	VWR-1892
+Tharax Ferraris
+	VWR-605
+Thraxis Epsilon
+	SVC-371
+	VWR-383
+Whoops Babii
+	VWR-1640
+Zi Ree
+	VWR-671
+	VWR-682
+	VWR-1140
+Zipherius Turas
+	VWR-76
+	VWR-77