Thatcher Peskens 28e13570bc Merge remote-tracking branch 'dotcloud/master' into dhrp/docs ...

Conflicts:
	docker/docker.go
	docs/sources/installation/archlinux.rst
	docs/sources/installation/index.rst
	docs/sources/installation/ubuntulinux.rst
	runtime.go
	utils.go
Upstream-commit: 5a5e417d46fe0bcac974e7180f50b0c59a8ec320
Component: engine

2013-04-22 18:44:50 -07:00

components/engine

Merge remote-tracking branch 'dotcloud/master' into dhrp/docs

2013-04-22 18:44:50 -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%