add better OS detection for BDM
adding windows-specific ebs recommendation
Define, when possible, the inventory_dir variable
postgresql_db: add args lc_collate, lc_ctype

Allow the specification of additional locale settings (lc_collate and lc_ctype) when creating a new database (state=present).

Fail if the specified database already exists with different locale/encoding settings. (These settings can't be changed for existing databases as far as I know, and failing seems better than suggesting that no change was necessary by returning changed=False)
Strip quotes when parsing my.cnf

Remove leading/trailing single or double quotes when parsing the my.cnf
file in mysql_user and mysql_db.

Do this so that these modules parse the my.cnf file the same way that
the mysql client does.

From: http://dev.mysql.com/doc/refman/5.0/en/option-files.html

    You can optionally enclose the value within single quotation marks
    or double quotation marks, which is useful if the value contains a
    “#” comment character.

Fixes #2405
Fix version added attribute, update docs URL
Quoting
Fix RHN module YAML docs formatting
Merge pull request #2496 from lorin/mycnf-quotes

Strip quotes when parsing my.cnf
Fix reinplace in macports package to work on both 10.7 and 10.8

reinplace on OSX 10.8 seems to behave differently, this change has been tested
on a few 10.8 and 10.7 machines.
Allow conditionals on BYPASS_HOST_LOOP plugins like add_host
Ensure that when transferring a file to a directory the name of the file is the correct basename and not 'source'.
Add state to rhn_channel docs
Merge pull request #2498 from jcftang/devel

Fix reinplace in macports package to work on both 10.7 and 10.8
Merge branch 'ansible_inventory_basedir' of git://github.com/stoned/ansible into test_basedir

Conflicts:
	lib/ansible/runner/__init__.py
Resolve merge commit.
Add state to rhn_channel docs
Merge branch 'test_basedir' into devel
update changelog
Let the callbacks see the playbook and (current) runner objects.