13111: Merge branch 'master' into 13111-webdav-projects
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Apr 2018 19:56:12 +0000 (15:56 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Apr 2018 19:56:12 +0000 (15:56 -0400)
commit134815098b060c232d1eee381d1eeb8e9d6162ff
tree83f20becb12a75109fa2935e95ee367b27a71820
parent0a372dba07f3483468206bb72e246f4a7d1e4e3d
parenta9a138acb8d428a96b90ccee0e60ec5c82f8394b
13111: Merge branch 'master' into 13111-webdav-projects

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>