2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809
authorTom Clegg <tom@curoverse.com>
Thu, 15 May 2014 18:19:06 +0000 (14:19 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 May 2014 18:19:06 +0000 (14:19 -0400)
commit03395937ba05b9e3192e346a355c691f45cc7c85
tree0bec061943b4e14cb7851cbfdd9f00ebf7bb4442
parentcff5301bbc1e1c8f8421fb56dca5a76dfebb058c
parentce5b843c32f6ee74f02a40044073dd4288d16dee
2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

Conflicts:
apps/workbench/app/models/arvados_api_client.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/models/arvados_api_client.rb
apps/workbench/app/views/layouts/application.html.erb