summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-14 08:33:25 -0400
committerOz Linden <oz@lindenlab.com>2011-09-14 08:33:25 -0400
commitb2d20f5a989bde2c4db90091bec37d310cc346fc (patch)
treee7161a9e1fc54973c6b324ff5072ea34ff14fa7a /doc/contributions.txt
parent961c4d3816132f6c3851edf6d8831ca2ed59e203 (diff)
parent677135f3c7e0a375bfc3ea1a08ce653c1daa91ee (diff)
merge changes for storm-1532
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index cbc57d211c..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