summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-03 11:38:46 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-03 11:38:46 -0800
commit0ea483ce60c96d7f17cd461c617449f70a21d7a4 (patch)
tree4c0f1cf5788511a6fb520dce49aad00d12461ff0 /doc
parentc767276ce62f18a295d64054beda438250abd4ae (diff)
parent2491555272283340206f3532b9417ec07df40022 (diff)
merge
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index adfee2cce9..2334aeb17b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -356,6 +356,8 @@ Joghert LeSabre
Jonathan Yap
VWR-17801
STORM-616
+ STORM-679
+ STORM-596
Kage Pixel
VWR-11
Ken March
@@ -768,16 +770,16 @@ WolfPup Lowenhar
STORM-102
STORM-103
STORM-143
+ STORM-255
+ STORM-256
STORM-535
STORM-544
STORM-654
+ STORM-674
VWR-20741
VWR-20933
Zai Lynch
VWR-19505
-Wolfpup Lowenhar
- STORM-255
- STORM-256
Zarkonnen Decosta
VWR-253
Zi Ree