Merge branch 'master' into 2640-folder-api
authorTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 21:01:50 +0000 (17:01 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 21:01:50 +0000 (17:01 -0400)
commitd8de76141cbe9a9af10dfc408b6d656cc727bbe5
tree081d56cbd3f3d5a17dda8a9d0766177bf88a5aa7
parent6b21bd450e8b8ed968a965290e641a75660cd695
parent8dbf8bd4d53c200ca81494556326c03abae74581
Merge branch 'master' into 2640-folder-api

Conflicts:
apps/workbench/app/models/arvados_api_client.rb
apps/workbench/app/models/arvados_api_client.rb