summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-11-24 10:28:41 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-11-24 10:28:41 -0800
commit82f3a34e17f82d894e6506d1451002a3b563fd8d (patch)
treedb422827f81f1c2215199cd764d18a9c8e71eb82 /doc
parentd18e4c68843d524e871ffb24427a9df52dce1243 (diff)
parentd7d23d16246e182c1cc74a57cac357aaa5c6c8e2 (diff)
Merge
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index adfee2cce9..d4e459039d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -768,16 +768,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