Merge branch '3699-arv-copy'
authorTim Pierce <twp@curoverse.com>
Fri, 24 Oct 2014 17:20:48 +0000 (13:20 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 24 Oct 2014 17:20:48 +0000 (13:20 -0400)
Closes #3699.

1  2 
sdk/python/arvados/commands/keepdocker.py
sdk/python/arvados/config.py

Simple merge