dotcloud/docker — pull request #6825 by SvenDowideit (2014-07-03 01:08:43+00:00)
Title: missed these merge conflicts when manually rebasing too many files

Docker-DCO-1.1-Signed-off-by: SvenDowideit (github: SvenDowideit)