summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
committerOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
commitc118ec209907618c77613990fe2359d4f92802e6 (patch)
treeb2fa95d1fa1563cdee89d2bf035b680c64918c0f /doc
parent54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff)
parent67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff)
merge up changes for 2.8.0 release
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 b744f4db3e..bad78dcd5f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -158,6 +158,8 @@ Ann Congrejo
CT-193
Ansariel Hiller
STORM-1101
+ VWR-25480
+ VWR-26150
Ardy Lay
STORM-859
VWR-19499
@@ -446,6 +448,7 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
+ STORM-1462
Kage Pixel
VWR-11
Ken March