Merge branch 'master' into 2640-folder-api
authorTom Clegg <tom@curoverse.com>
Thu, 1 May 2014 18:26:40 +0000 (14:26 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 1 May 2014 18:26:40 +0000 (14:26 -0400)
commit3bd5f6c3f353059c15eeea51b16b2fdee694d504
treebe7dd4372ea51dff3bcfd7dcee784d74a4b0f25e
parent6a53a3c5d97d33586567f8df082a725f7d229327
parentcd08497d1c914cd75fd8be08f9f3ef3bc75485f2
Merge branch 'master' into 2640-folder-api

Conflicts:
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb