Michael DeHaan d1a59fe62b Merge branch 'when_docs' of git://github.com/tartansandal/ansible into devel ... Conflicts: docsite/latest/rst/playbooks2.rst docsite/latest/searchindex.js		2013-05-05 12:43:06 -04:00
..
latest	Merge branch 'when_docs' of git://github.com/tartansandal/ansible into devel	2013-05-05 12:43:06 -04:00
.gitignore	Subtree merge of ansible-docs	2012-10-08 07:44:38 -04:00
.nojekyll	Subtree merge of ansible-docs	2012-10-08 07:44:38 -04:00