Merge pull request #3213 from veeti/apt_key_data

Document the data argument for apt_key
Merge pull request #3225 from eest/openbsd_pkg-check_mode

openbsd_pkg: Add check_mode support.
Merge pull request #3228 from skvidal/facts.d

first cut and docs for facts.d mechanism for setup module
Fix merge conflict.
Resolve docs conflict.
Merge branch 'user_password_update_optional' of git://github.com/bcoca/ansible into devel

Conflicts:
	library/system/user
Merge pull request #3220 from dsedivec/devel

Improve Markdown (and other) module doc output
Merge pull request #3218 from lorin/fileglob-roles

Document: with_file(glob) relative path and roles
Merge pull request #3217 from dagolden/topic/late-sudo_user

Expand sudo_user after variable merging
adds 2 django commands (migrate, collectstatic)

Signed-off-by: Jochen Maes <jochen@sejo-it.be>
Merge pull request #3204 from goozbach/devel

fixed msg bug in library/cloud/quantum_network
Merge pull request #3202 from trbs/20130613_docs_fix_ansible_cfg_loading_order

docs fix ansible cfg loading order
Merge pull request #3120 from chrisgardner/solaris-os-facts

Add Solaris O/S distribution facts
Merge pull request #3169 from Debilski/fix-duplicate-host-reads

Allow inventory to be read from a pipe
Merge branch '20130613_xbits' of git://github.com/trbs/ansible into devel
Merge pull request #3172 from gw0/fix-mongodb2.2-compat

Fix `mongodb_user` compatibility with MongoDB 2.2 (used in Debian 7).
Merge pull request #3162 from strawlab/apt-key-binary-fix

allow apt-key module to work with binary key
Add OpenRC support to the service module.
Remove reference to non-existant module.
Docs: consistently format playbook EXAMPLES