summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-16 10:55:31 -0400
committerOz Linden <oz@lindenlab.com>2012-08-16 10:55:31 -0400
commit0c903609d47fbff0b2436c8873b6abb2ce2d5e3c (patch)
tree1f943f130f616b6e0cf376a3b941c777632eeb7e /doc
parent557376b95c28379e8e6edf9a73a25929b900784e (diff)
parentb4e1d03584ce0ee740887def2f7204dc3c5733c4 (diff)
merge changes for storm-1895
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 36aa6b36fa..3218624f76 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1235,6 +1235,8 @@ Watty Berkson
Westley Schridde
Westley Streeter
Whimsy Winx
+Whirly Fizzle
+ STORM-1895
Whoops Babii
VWR-631
VWR-1640