summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-19 12:26:57 -0400
committerOz Linden <oz@lindenlab.com>2011-05-19 12:26:57 -0400
commitfd427f0ab92993aa9205850b3e6ca844f9705417 (patch)
tree64406ca352feffce25ff1c4bef4a144ec7b2f505 /doc
parent78cad5181839c530f32c7e50791933dc00a3df6d (diff)
parent5eb6cb8d86cf19da79d034df52a0254079f2c95f (diff)
merge changes for storm-1100
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index d6890df1e1..dfbccb5a6c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -466,6 +466,8 @@ Lance Corrimal
VWR-25269
Latif Khalifa
VWR-5370
+leliel Mirihi
+ STORM-1100
Lisa Lowe
CT-218
CT-219
@@ -768,6 +770,8 @@ Strife Onizuka
VWR-2265
VWR-4111
SNOW-691
+TankMaster Finesmith
+ STORM-1100
Tayra Dagostino
SNOW-517
SNOW-543
@@ -829,6 +833,8 @@ Tofu Buzzard
VWR-24509
TraductoresAnonimos Alter
CT-324
+TriloByte Zanzibar
+ STORM-1100
Tue Torok
CT-68
CT-69