From: radhika <radhika@curoverse.com>
Date: Thu, 9 Jul 2015 00:26:23 +0000 (-0400)
Subject: Merge branch 'master' into 6279-web-shell-client
X-Git-Tag: 1.1.0~1511^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8d0355a42caf66f40fe3007a43dc2c8b88712083

Merge branch 'master' into 6279-web-shell-client
---

8d0355a42caf66f40fe3007a43dc2c8b88712083