Andy Rothfusz d5551edef2 Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627 ...

Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine

2013-07-02 15:10:07 -07:00

..

engine

Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627

2013-07-02 15:10:07 -07:00