summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:37:53 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:37:53 -0400
commite2baffa940a5797f2055f13ceb9722de524b2ec3 (patch)
treebf53bf6b8856a20d732f57d41a28a2c71941ac65 /doc
parent74787fda486a68e344caf125fc76c80ca9c40822 (diff)
parentc77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (diff)
merge changes for storm-610
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 71c54e8624..ff982ec61a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -417,6 +417,8 @@ Jonathan Yap
STORM-1020
STORM-1064
STORM-960
+ STORM-1108
+ STORM-1094
STORM-1077
STORM-953
Kage Pixel
@@ -440,6 +442,8 @@ Kitty Barnett
Kunnis Basiat
VWR-82
VWR-102
+Lance Corrimal
+ VWR-25269
Latif Khalifa
VWR-5370
Lisa Lowe
@@ -789,6 +793,7 @@ Thickbrick Sleaford
VWR-13483
VWR-13947
VWR-24420
+ STORM-1147
Thraxis Epsilon
SVC-371
VWR-383