summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-28 11:02:15 -0500
committerOz Linden <oz@lindenlab.com>2011-11-28 11:02:15 -0500
commitd22584bfe51c034076d9e8df01f70628abc22f85 (patch)
treeb635b0e89ae9957659da1e96944b99941a4f9dc7 /doc
parentb69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (diff)
parent5374e544ed5888548bea334bd8ca7ca53372d031 (diff)
merge changes for vmrg-193
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1e28aa6fb4..9f6de781b4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1119,6 +1119,7 @@ Tofu Buzzard
VWR-24509
STORM-1684
SH-2477
+ STORM-1684
Tony Kembia
Torben Trautman
TouchaHoney Perhaps