Conflicts:
	library/cloud/s3

zypper_repository: Remove trailing "/"

Example: ftp://download.nvidia.com/opensuse/12.2 == ftp://download.nvidia.com/opensuse/12.2/

Fixing issue with symlinked vaults

Don't return 'state' attr in bigpanda module

get_url module: Add timeout parameter

Adding a new 'load_callback_plugins' config option, defaults to False

Remove namespace restrictions in ec2_metric_alarm

Fixes a double parameter being passed afterwards

Documentation edit for vsphere_guest module

Noted in documentation that standalone esxi hosts should use ha-datacenter for the datacenter string

This option, when set to True, allows "ansible" command to load callback plugins

Fixes #7970

Fixes #8810

Fixes #8898

Fixes #8890

Move some comments to the unittest as we might look at that if we decide
to refactor the code.

the passwords are correctly hidden in the output.

* makes speed acceptable for some datasets
* obfuscates multiple detected passwords
* obfuscates more characters to account for some corner cases when
  trying to detect passwords.

Fixes #8364

Fix for #8886. Correct state=absent for statements without name/alias.

Make ssh debug easier to read and paste

fix typo in zypper module (requiered -> required)

Fix #8666 for real

Fixes #8861

Fixes #8884

Currently, ansible -vvvv show the following:

    hostname EXEC ['ssh', '-C', '-vvv', '-o', 'ControlMaster=auto',

This is not good if someone want to cut and paste it to see if something
is wrong with the command line, so join the dictionnary strings with spaces
to have 1 string in the output.