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
36 changed files with 54 additions and 54 deletions

View File

@@ -98,7 +98,7 @@ options:
description:
- The character set of email being sent
default: 'us-ascii'
requred: false
required: false
"""
EXAMPLES = '''