diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
| commit | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (patch) | |
| tree | 2e25cb610683043143bf8b871e2ddec1021039d3 /doc | |
| parent | 07717a60dc3bce644dc08d7e8b2fa74715b9c7c0 (diff) | |
| parent | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff) | |
Merge again
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 |