summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-09-23 16:39:09 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-09-23 16:39:09 -0700
commit80bb16b36a3bf43514ee0f918dd6d97cbbc1e49f (patch)
treef05d780fb077be7460bd6a38c90fcd900fbf6974 /doc
parent74d9663ff6444899bd5eedd29da197746a3ae226 (diff)
parente42a9ec70c0e5fc98282c98358039445d0d68b84 (diff)
merge
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 5930bab04f..bcdc5a63d2 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -177,6 +177,8 @@ Ardy Lay
VWR-24917
Argent Stonecutter
VWR-68
+ArminWeatherHax
+ STORM-1532
Armin Weatherwax
VWR-8436
ArminasX Saiman
@@ -568,6 +570,7 @@ Jonathan Yap
STORM-1276
STORM-1462
STORM-1459
+ STORM-1297
STORM-1522
STORM-1567
STORM-1572