From: Peter Amstutz Date: Fri, 31 Jul 2015 14:31:11 +0000 (-0400) Subject: Merge branch 'master' into 6676-document-sso X-Git-Tag: 1.1.0~1449^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/43a95731adfcf942fd9ab598c2b8e2c80911de0c Merge branch 'master' into 6676-document-sso --- 43a95731adfcf942fd9ab598c2b8e2c80911de0c