Andy Rothfusz 55b5889a0f Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627 ... Conflicts: docs/sources/concepts/manifesto.rst		2013-07-02 13:00:08 -07:00
..
images	Adding files for terms	2013-07-02 12:09:57 -07:00
index.rst	Cleaning up the welcome page, terminology.	2013-07-02 12:09:57 -07:00
manifesto.rst	Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627	2013-07-02 13:00:08 -07:00