Merge branch 'spelling' of git://github.com/cgar/ansible into devel

Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
This commit is contained in:
Michael DeHaan 2014-08-08 13:28:45 -04:00
commit 3bead39c75
36 changed files with 54 additions and 54 deletions

View file

@ -1,4 +1,4 @@
# order of groups, children, and vars is not signficant
# order of groups, children, and vars is not significant
# so this example mixes them up for maximum testing
[nc:children]