Solomon Hykes c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin ...

Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine

2013-11-07 23:26:52 +00:00

components/engine

Merge branch 'master' into 0.6.5-dm-plugin

2013-11-07 23:26:52 +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%