summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
committerOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
commit764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch)
treea2ac72c6625c729e73ae6077e790a104c2b598a3 /doc
parentba90a4ec367d47a6876962d7d071cf4615289a11 (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 c3c0104583..5ad7c88734 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1167,9 +1167,9 @@ Tofu Buzzard
CTS-411
STORM-546
VWR-24509
- STORM-1684
SH-2477
STORM-1684
+ STORM-1819
Tony Kembia
Torben Trautman
TouchaHoney Perhaps