Merge master to output-tags branch and resolve conflict

[arvados.git] / sdk / python / bin / arv-ws

#!/usr/bin/env python

from arvados.commands.ws import main
main()