Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool

1 files changed, 92 insertions, 0 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcf714b29a..e1fb234f05 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -61,21 +61,45 @@ Aimee Trescothick
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
+	SNOW-240
 	SNOW-522
+	SNOW-626
 	SNOW-756
 	SNOW-764
+	SNOW-800
 	VWR-10001
+	VWR-10579
 	VWR-10759
 	VWR-10837
 	VWR-12691
+	VWR-12984
+	VWR-13040
 	VWR-13996
 	VWR-14426
+	VWR-24247
+	VWR-24251
+	VWR-24252
+	VWR-24254
+	VWR-24261
+	VWR-24315
+	VWR-24317
+	VWR-24320
+    VWR-24321
+ 	VWR-24354
+	VWR-24519
 	SNOW-84
+	SNOW-477
+	SNOW-744
 	SNOW-766
 	STORM-163
+	STORM-955
+	STORM-960
 Ales Beaumont
 	VWR-9352
 	SNOW-240
+Alexandrea Fride
+    STORM-255
+	STORM-960
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -124,6 +148,7 @@ Alissa Sabre
 	VWR-12617
 	VWR-12620
 	VWR-12789
+	SNOW-322
 Angus Boyd
 	VWR-592
 Ann Congrejo
@@ -140,6 +165,7 @@ Asuka Neely
 Balp Allen
 	VWR-4157
 Be Holder
+	SNOW-322
 	SNOW-397
 Benja Kepler
 	VWR-746
@@ -170,9 +196,11 @@ Boroondas Gupte
 	SNOW-610
 	SNOW-624
 	SNOW-737
+	STORM-318
 	VWR-233
 	VWR-20583
 	VWR-20891
+	VWR-23455
 	WEB-262
 Bulli Schumann
 	CT-218
@@ -202,6 +230,12 @@ Catherine Pfeffer
 Celierra Darling
 	VWR-1274
 	VWR-6975
+Coaldust Numbers
+    VWR-1095
+Cron Stardust
+	VWR-10579
+Cypren Christenson
+	STORM-417
 Dale Glass
 	VWR-120
 	VWR-560
@@ -343,7 +377,24 @@ JB Kraft
 Joghert LeSabre
 	VWR-64
 Jonathan Yap
+	STORM-435
+	STORM-523
+	STORM-596
+	STORM-615
+	STORM-616
+	STORM-643
+	STORM-679
+	STORM-723
+	STORM-726
+	STORM-737
+	STORM-785
+	STORM-812
+	STORM-829
+	STORM-844
+	STORM-869
 	VWR-17801
+	VWR-24347
+	STORM-975
 Kage Pixel
 	VWR-11
 Ken March
@@ -357,6 +408,10 @@ Khyota Wulluf
 	VWR-9966
 Kitty Barnett
 	VWR-19699
+	STORM-288
+	STORM-799
+	STORM-800
+    VWR-24217
 Kunnis Basiat
 	VWR-82
 	VWR-102
@@ -381,6 +436,8 @@ Malwina Dollinger
 	CT-138
 march Korda
 	SVC-1020
+Marine Kelley
+    STORM-281
 Matthew Dowd
 	VWR-1344
 	VWR-1651
@@ -402,6 +459,7 @@ McCabe Maxsted
 	VWR-8689
 	VWR-9007
 Michelle2 Zenovka
+    STORM-477
 	VWR-2652
 	VWR-2662
 	VWR-2834
@@ -529,6 +587,7 @@ Pf Shan
 	CT-230
 	CT-231
 	CT-321
+	SNOW-422
 princess niven
 	VWR-5733
 	CT-85
@@ -562,8 +621,11 @@ Robin Cornelius
 	SNOW-585
 	SNOW-599
 	SNOW-747
+	STORM-422
+	STORM-960
 	VWR-2488
 	VWR-9557
+	VWR-10579
 	VWR-11128
 	VWR-12533
 	VWR-12587
@@ -585,6 +647,9 @@ Salahzar Stenvaag
 	CT-321
 Sammy Frederix
 	VWR-6186
+Satomi Ahn
+	STORM-501
+	STORM-229
 Scrippy Scofield
 	VWR-3748
 Seg Baphomet
@@ -606,6 +671,8 @@ Sergen Davies
 	CT-321
 Shawn Kaufmat
 	SNOW-240
+Siana Gearz
+	STORM-960
 SignpostMarv Martin
 	VWR-153
 	VWR-154
@@ -643,6 +710,7 @@ Strife Onizuka
 	VWR-183
 	VWR-2265
 	VWR-4111
+	SNOW-691
 Tayra Dagostino
 	SNOW-517
 	SNOW-543
@@ -690,11 +758,14 @@ Thickbrick Sleaford
 	VWR-9287
 	VWR-13483
 	VWR-13947
+	VWR-24420
 Thraxis Epsilon
 	SVC-371
 	VWR-383
 tiamat bingyi
 	CT-246
+Tofu Buzzard
+	STORM-546
 TraductoresAnonimos Alter
 	CT-324
 Tue Torok
@@ -706,6 +777,10 @@ Tue Torok
 	CT-74
 Twisted Laws
 	SNOW-352
+	STORM-466
+	STORM-467
+	STORM-844
+	STORM-643
 Vadim Bigbear
 	VWR-2681
 Vector Hastings
@@ -740,6 +815,23 @@ Whoops Babii
 	VWR-8298
 Wilton Lundquist
 	VWR-7682
+WolfPup Lowenhar
+	SNOW-622
+	SNOW-772
+	STORM-102
+	STORM-103
+	STORM-143
+	STORM-255
+	STORM-256
+	STORM-288
+	STORM-535
+	STORM-544
+	STORM-654
+	STORM-674
+	STORM-776
+	STORM-825
+	VWR-20741
+	VWR-20933
 Zai Lynch
 	VWR-19505
 Zarkonnen Decosta