Guillaume J. Charmes 9587bb386c Merge branch 'master' into builder_server-3 ...

Conflicts:
	docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine

2013-06-20 10:27:12 -07:00

components/engine

Merge branch 'master' into builder_server-3

2013-06-20 10:27:12 -07:00

S

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%