Merge branch '6781-arvados-login-sync' refs #6781
authorTom Clegg <tom@curoverse.com>
Wed, 26 Aug 2015 15:29:32 +0000 (11:29 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Aug 2015 15:29:32 +0000 (11:29 -0400)

Trivial merge