2853: Merge branch 'master' into 2853-rendezvous
authorTom Clegg <tom@curoverse.com>
Wed, 12 Nov 2014 18:59:59 +0000 (13:59 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 12 Nov 2014 18:59:59 +0000 (13:59 -0500)
commite158f485053be1e840073b321033d60d686a55a8
tree206569c1bec5d8cda873d00fc2610e7cab524159
parentc7b7e4d44e9349c9104fbfcd33c5e4b97fe17a71
parent5141c3ee23e89696773e227a93236ef2a51543c2
2853: Merge branch 'master' into 2853-rendezvous

Conflicts:
sdk/python/arvados/keep.py
doc/sdk/cli/index.html.textile.liquid
doc/sdk/cli/subcommands.html.textile.liquid
sdk/python/arvados/keep.py
sdk/python/tests/test_keep_client.py