From: Tom Clegg <tom@curoverse.com>
Date: Tue, 29 Apr 2014 17:56:21 +0000 (-0400)
Subject: Merge branch '1969-persistent-switch'
X-Git-Tag: 1.1.0~2596^2~32
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c18bde8300e115b215e58d6930d0495b2c33b49f

Merge branch '1969-persistent-switch'

closes #1969
---

c18bde8300e115b215e58d6930d0495b2c33b49f