Merge branch '12511-is-trashed-query' refs #12511
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 11 Dec 2017 21:34:37 +0000 (16:34 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 11 Dec 2017 21:35:05 +0000 (16:35 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>


Trivial merge