Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 3 Jun 2014 19:22:33 +0000 (15:22 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 3 Jun 2014 19:22:33 +0000 (15:22 -0400)
commitcda441b1b6e50811c7dbd8d5c61ead1b39c91857
tree79dcf843de8667d8e239a3667544adfae67ccc32
parenta285726d2297f71254529ab7d5b02f9246a0c413
parentab2550bca241736c162a435d62fc3ccb4ac5dc8e
Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs #2939

Conflicts:
services/api/db/schema.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/models/arvados_base.rb
services/api/db/schema.rb