merge from viewer-pre-beta

1 files changed, 17 insertions, 0 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index e7537b608b..dfbccb5a6c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -158,6 +158,7 @@ Ann Congrejo
 Ansariel Hiller
 	STORM-1101
 Ardy Lay
+	STORM-859
 	VWR-19499
 	VWR-24917
 Argent Stonecutter
@@ -196,6 +197,7 @@ blino Nakamura
 Boroondas Gupte
 	OPEN-29
 	OPEN-39
+	OPEN-39
 	SNOW-278
 	SNOW-503
 	SNOW-510
@@ -253,6 +255,8 @@ Dale Glass
 	VWR-2502
 	VWR-1358
 	VWR-2041
+Draconis Neurocam
+	STORM-1259
 Drew Dri
 	VWR-19683
 Drewan Keats
@@ -366,6 +370,7 @@ Ian Kas
 Ima Mechanique
 	OPEN-50
 	OPEN-61
+	STORM-1175
 Irene Muni
 	CT-324
 	CT-352
@@ -418,6 +423,7 @@ Jonathan Yap
 	VWR-17801
 	VWR-24347
 	STORM-975
+	STORM-990
 	STORM-1019
 	STORM-844
 	STORM-643
@@ -433,6 +439,7 @@ Jonathan Yap
 	STORM-956
 	STORM-1095
 	STORM-1236
+	STORM-1259
 Kage Pixel
 	VWR-11
 Ken March
@@ -450,6 +457,7 @@ Kitty Barnett
 	STORM-799
 	STORM-800
 	STORM-1001
+	STORM-1175
     VWR-24217
 Kunnis Basiat
 	VWR-82
@@ -458,6 +466,8 @@ Lance Corrimal
 	VWR-25269
 Latif Khalifa
 	VWR-5370
+leliel Mirihi
+	STORM-1100
 Lisa Lowe
 	CT-218
 	CT-219
@@ -760,6 +770,8 @@ Strife Onizuka
 	VWR-2265
 	VWR-4111
 	SNOW-691
+TankMaster Finesmith
+	STORM-1100
 Tayra Dagostino
 	SNOW-517
 	SNOW-543
@@ -816,9 +828,13 @@ Thraxis Epsilon
 tiamat bingyi
 	CT-246
 Tofu Buzzard
+	CTS-411
 	STORM-546
+	VWR-24509
 TraductoresAnonimos Alter
 	CT-324
+TriloByte Zanzibar
+	STORM-1100
 Tue Torok
 	CT-68
 	CT-69
@@ -885,6 +901,7 @@ WolfPup Lowenhar
 	STORM-674
 	STORM-776
 	STORM-825
+	STORM-859
 	STORM-1098
 	VWR-20741
 	VWR-20933