Working on makefile
Merge pull request #1276 from mxxcon/patch-1

Typo in example section for 'setup' module docs.
Fix typo in autogenerated docs
Merge pull request #1274 from dagwieers/contrib-network-facts

Module network_facts to gather facts based on network information
Merge pull request #1271 from mavimo/openstack-rackspace-update

Openstack rackspace update
Merge pull request #1270 from jhoekx/yaml-inventory-plugin

Add a yaml format inventory plugin.
Merge pull request #1268 from dagwieers/hpilo-reboot-fix

Workaround for when HP iLO is in a state it won't accept requests
Example plugin to send out mails on error

This is useful mostly for playbooks that run unattended and for a limited set of systems. In case of provisioninging this plugin (together with a final mail action) helps to get notified when something went wrong, or when the installation finished successfully.

Unfortunately, there is no way to enable/disable a plugin from a playbook. So installing the plugin means all other use-cases (provisioning, troubleshooting, reporting or management) all send mails on failure. Something we may want to fix in the future...
Fix typo in inventory API test script.
Return multiple groups from inventory API.
Merge pull request #1283 from jhoekx/fix-inventory-api-groups

Fix inventory API groups
fix missing --limit in docssite examples
Merge pull request #1282 from dagwieers/mail-callback

Example plugin to send out mails on error
Unified document generator and make to generate JSON and JS files
Docs/json should not be checked in
Don't check in modules.js either
Don't check in docsite static HTML, so folks will know to just edit the RST.
Merge branch 'remove-argparse' of git://github.com/dagwieers/ansible into devel

Conflicts:
	hacking/module_formatter.py

Don't run webdocs build when building packages
Merge remote branch 'dagwieers/module-mail' into devel
Don't check in any module RST files as these are generated too.