Casey Bisson f8785b1704 Merge branch 'master' of github.com:docker/docker into joyentinstall ...

Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine

2015-03-20 14:37:17 -07:00

components/engine

Merge branch 'master' of github.com:docker/docker into joyentinstall

2015-03-20 14:37:17 -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%