Guillaume J. Charmes 18df81b8e1 Merge branch 'master' into builder_server-3 ...

Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine

2013-06-13 18:11:22 -07:00

components/engine

Merge branch 'master' into builder_server-3

2013-06-13 18:11:22 -07: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%