From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 23 Apr 2014 17:08:31 +0000 (-0400)
Subject: Merge branch 'master' into origin-2608-websocket-event-bus-alt2
X-Git-Tag: 1.1.0~2596^2~27^2~17
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/73cf2bb90245787fbbd7c18da51329524c40f6af

Merge branch 'master' into origin-2608-websocket-event-bus-alt2
---

73cf2bb90245787fbbd7c18da51329524c40f6af