summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-13 12:03:53 -0400
committerOz Linden <oz@lindenlab.com>2011-04-13 12:03:53 -0400
commit6bdfc3d0482b3bbfb55abdb71220ea19391fbe14 (patch)
treee0557f36fe0f02e0fdeb2952d2477c01a7498a63 /doc
parent19f356202a9516664c1cacb9b50e9b6e1e072375 (diff)
parentc77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (diff)
merge out changes up to but not including the STORM-610 change
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