summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-27 08:10:29 -0400
committerOz Linden <oz@lindenlab.com>2012-06-27 08:10:29 -0400
commit5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (patch)
tree433af79631cf0f386c6cf991cb01e119d5187009 /doc
parenta4913246770b58ed569021c484c213231aaae549 (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
merge up to 3.3.3-release
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..18df538d2a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1160,9 +1160,9 @@ Tofu Buzzard
CTS-411
STORM-546
VWR-24509
- STORM-1684
SH-2477
STORM-1684
+ STORM-1819
Tony Kembia
Torben Trautman
TouchaHoney Perhaps