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