summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-06 13:52:26 -0500
committerOz Linden <oz@lindenlab.com>2011-12-06 13:52:26 -0500
commitf54caff1e4c669c330c67def7092f2945991ae1d (patch)
tree2e2bae98edd72029c31ab48e129f9a954bddb520 /doc
parentac87f82377e0a676d867a01c16515e74e34b38a9 (diff)
parent3193170850ddc0fc3db57d40e9636ec77908dd70 (diff)
merge changes for storm-591
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 6b2af08fb1..ea9ccd576e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -583,6 +583,7 @@ Jonathan Yap
STORM-1639
STORM-910
STORM-1642
+ STORM-591
STORM-1105
STORM-1679
STORM-1222
@@ -924,6 +925,7 @@ Robin Cornelius
SNOW-599
SNOW-747
STORM-422
+ STORM-591
STORM-960
STORM-1019
STORM-1095