Victor Vieux fc1bf4682a Merge remote-tracking branch 'origin/release'
Conflicts:
	VERSION
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3afb89da48ee7e6e917d852416d434de9e078306
Component: engine
2014-07-09 19:23:53 +00:00
Description
No description provided
310 MiB
Languages
Go 92%
Shell 5.5%
Dockerfile 1.1%
Go-Checksums 0.9%
Makefile 0.3%
Other 0.2%