summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-11 14:06:27 -0500
committerOz Linden <oz@lindenlab.com>2011-02-11 14:06:27 -0500
commit4d040e3c5d6eb1f105bf837191e06866ba4bef5b (patch)
tree8ec750584b0e56549c451abf935322f47d0e6220 /doc
parent9251d95205e8c5d9ac4be4992cc1ab88cf07e58b (diff)
parent9bdaf04432c9daeda9a8d4596cd47143cb5980a1 (diff)
merge local changes
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e1fb234f05..5de3b7784f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -394,7 +394,11 @@ Jonathan Yap
STORM-869
VWR-17801
VWR-24347
+ STORM-844
STORM-975
+ STORM-643
+ STORM-960
+ STORM-953
Kage Pixel
VWR-11
Ken March