Merge branch 'master' of git.curoverse.com:arvados into 2640-folder-api
authorTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:06:51 +0000 (17:06 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:06:51 +0000 (17:06 -0400)
commit73e28547278ddff84847c12ad7f926e717ae553a
tree389da12903f0522d6447d3376c60409504a7ef4b
parent6f918d1fc451f1ad72350677155a0d67f40a9628
parent22db59393203f550e0c77e65c650e664667492ab
Merge branch 'master' of git.curoverse.com:arvados into 2640-folder-api

Conflicts:
services/api/db/schema.rb
services/api/test/test_helper.rb
services/api/db/schema.rb
services/api/test/functional/arvados/v1/users_controller_test.rb
services/api/test/test_helper.rb