summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
commitce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch)
treef9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /doc
parent4fb809eed5fbed458b5be883fba7196a5712aa48 (diff)
parentb2ef0f99882db73680cc5dfb9570255414f7ba6d (diff)
Merge.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 388ea31c0b..0cdf37d72f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1195,12 +1195,15 @@ Zarkonnen Decosta
Zeja Pyle
ZenMondo Wormser
Zi Ree
+ SH-489
VWR-423
VWR-671
VWR-682
VWR-684
VWR-9127
VWR-1140
+ VWR-24017
+ VWR-25588
Zipherius Turas
VWR-76
VWR-77