Merge branch '1965-fuse-support-directories'
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Feb 2014 18:23:19 +0000 (13:23 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Feb 2014 18:23:19 +0000 (13:23 -0500)
commit0e53f1c16b9417eecb693fe398585c81f7b4e329
tree4318cf3b3be09d2ec60833093d46406841576a0b
parentbf1efb4b1752f0c04c3ab477e0733ffd04005c3c
parentd4346ebd1ef1158a73d9adfa757cfce0713abb1d
Merge branch '1965-fuse-support-directories'

Conflicts:
sdk/python/arvados/keep.py
sdk/cli/bin/crunch-job
sdk/python/arvados/keep.py
sdk/python/setup.py.src
services/api/app/models/collection.rb