diff options
author | callum <none@none> | 2011-10-28 11:01:11 -0700 |
---|---|---|
committer | callum <none@none> | 2011-10-28 11:01:11 -0700 |
commit | b94f45db81fa6a4625d58301a13f964996fa65bd (patch) | |
tree | 1c9134e08ce22f4e122c48e3a746259a8f7ef470 /doc | |
parent | d08d018323272866b189979d0e772d50cdece4b2 (diff) | |
parent | f84a69a7e00f0eed49894e14336126849a9e7b29 (diff) |
Merge with head
Diffstat (limited to 'doc')
-rw-r--r-- | doc/contributions.txt | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bcdc5a63d2..988410701b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -65,15 +65,12 @@ Aimee Trescothick Alejandro Rosenthal VWR-1184 Aleric Inglewood - SNOW-84 + OPEN-38 SNOW-240 - SNOW-477 SNOW-522 SNOW-626 - SNOW-744 SNOW-756 SNOW-764 - SNOW-766 SNOW-800 VWR-10001 VWR-10579 @@ -99,8 +96,11 @@ Aleric Inglewood VWR-24366 VWR-24519 VWR-24520 + SNOW-84 + SNOW-477 + SNOW-744 + SNOW-766 STORM-163 - STORM-864 STORM-955 STORM-960 Ales Beaumont @@ -575,8 +575,14 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-1579 + STORM-1638 + STORM-976 + STORM-1639 + STORM-910 + STORM-1642 Kadah Coba - STORM-1060 + STORM-1060 Jondan Lundquist Josef Munster Josette Windlow @@ -622,6 +628,7 @@ Latif Khalifa VWR-5370 leliel Mirihi STORM-1100 + STORM-1602 len Starship Lisa Lowe CT-218 @@ -1032,6 +1039,9 @@ Synystyr Texan Takeda Terrawyng TankMaster Finesmith STORM-1100 + STORM-1602 + STORM-1258 + VWR-26622 Talamasca Tali Rosca Tayra Dagostino @@ -1130,6 +1140,7 @@ Vector Hastings VWR-8726 Veritas Raymaker Vex Streeter + STORM-1642 Viaticus Speculaas Vick Forcella Villain Baroque |