diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 16:39:38 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 16:39:38 -0800 |
commit | a07e6c625108988ad664df70a1842b53c843f223 (patch) | |
tree | ed1816bf0794eca05b06580ea6cbbf2f8f8652b5 /doc | |
parent | a6ff010dc1bee1b526fd8a83f9ef71d1e51bd082 (diff) | |
parent | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff) |
Merge branches
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 26d9b98b95..c02c6dba1f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -156,6 +156,7 @@ Ann Congrejo CT-193 Ardy Lay VWR-19499 + VWR-24917 Argent Stonecutter VWR-68 Armin Weatherwax @@ -831,6 +832,7 @@ WolfPup Lowenhar STORM-102 STORM-103 STORM-143 + STORM-236 STORM-255 STORM-256 STORM-288 |