summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-05 10:43:14 -0400
committerOz Linden <oz@lindenlab.com>2012-06-05 10:43:14 -0400
commitc432ee1581614ea75230bc59d90671eac875527f (patch)
tree10f4b2c4db1dd1e7d79b2ac49e0c6f2f7e23def8 /doc
parent2ad0bc334dc275f60889d7f083e90b8d2775104d (diff)
parentf9879b8ea922affd4a1e82c45ce120d5e016c705 (diff)
merge changes for storm-1845
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 89fcfd0601..8f9b728c3b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -727,6 +727,8 @@ Marc2 Sands
Marianne McCann
Marine Kelley
STORM-281
+MartinRJ Fayray
+ STORM-1845
Matthew Anthony
Matthew Dowd
VWR-1344