Merge branch '18-termcap_issues-fix' of github.com:dotcloud/docker into 18-termcap_issues-fix
Upstream-commit: 211ed0a7665b44fe8ed22a467b52593bd34d43a9 Component: engine
This commit is contained in:
Upstream-commit: 211ed0a7665b44fe8ed22a467b52593bd34d43a9 Component: engine