Solomon Hykes a4e9bba7a3 Merge branch 'master' into simpler-build-upload ...

Conflicts:
	api.go
	builder_client.go
	commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine

2013-06-20 14:19:09 -07:00

..

MAINTAINERS

Documented who decides what and how.

2013-05-28 19:39:09 -07:00

registry_test.go

Disable registry unit tests

2013-05-15 17:57:53 -07:00

registry.go

Merge branch 'master' into simpler-build-upload

2013-06-20 14:19:09 -07:00