summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorsimon <none@none>2013-12-09 16:11:09 -0800
committersimon <none@none>2013-12-09 16:11:09 -0800
commit50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch)
tree269464d15a8d4a8803535b843e8ce7dcac7414cb /doc
parent1a456c2e41905e93e393dc2dda0d143ee7611275 (diff)
parent4a09065691b6a3461ff2f4541abb3accade207fe (diff)
Merge in downstream code for 3.6.13
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 99527c0587..2f9d0c2c86 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1184,6 +1184,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca