Merge remote-tracking branch 'origin/master' into 2075-workbench-paging
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 14 Mar 2014 17:57:40 +0000 (13:57 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 14 Mar 2014 17:57:40 +0000 (13:57 -0400)
commite6c5563c60df03d4d061a6b301b730f0672b69a5
treeea5aaaedbdb8972880c6f82cd02386abf28e31c6
parente63c37081683a418bf1ad7b9428ffaf24fe6a8f1
parent10e70461bf3cb8c6ff859ce8313629a56783ba34
Merge remote-tracking branch 'origin/master' into 2075-workbench-paging

Conflicts:
services/api/app/controllers/arvados/v1/schema_controller.rb
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/schema_controller.rb