Merge branch 'refactor_api_file' of github.com:dotcloud/docker into refactor_api_file
Upstream-commit: 1cce8572e2b0d108372f8734c2b4478ecaa8cd04 Component: engine
This commit is contained in:
Upstream-commit: 1cce8572e2b0d108372f8734c2b4478ecaa8cd04 Component: engine