Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop
Merge branch 'sayap-ec2-start-stop' into devel
Fixing a doc mistake in the ec2 module from 4269bb6
Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False

Fix #7057 missing False default for vars_prompt
Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel
Merge branch 'jjshoe-devel' into devel
Merge pull request #7110 from orgoj/docker-patch-version_comment

module docker - add docker version comment
rds module: Fix undeclared reference to "params" when setting password in
modify mode.
Assert the MOCK_CFG exists for the mock-rpm build target
Merge pull request #7343 from lberruti/alternatives_python5_2

Make alternatives module python 2.5 compatible
Add documentation for required parameter name to quantum_subnet
Merge pull request #7342 from herbygillot/rds-params-fix

rds module: Fix undeclared reference to "params" when setting password in modify mode
Fix grammar and value errors in cron documentation
Remove check for Ghost state

This doesn't exist anymore and causes ansible to throw a KeyError
Adding an integration test for variable precedence
Merge pull request #7338 from discordianfish/remove-ghost-state

Remove check for Ghost state
Fix: Remove check for Ghost state

This fixed the just committed change handling non existent Ghost state.
Merge pull request #7350 from discordianfish/remove-ghost-state

Fix: Remove check for Ghost state
Add the start of a graphviz doc to illustrate variable precedence graphically.
Merge pull request #7346 from tongpu/devel

Add documentation for required parameter name to quantum_subnet