Merge branch 'testing_427' into devel
Merge branch 'nocows' of git://github.com/jpmens/ansible into devel

Conflicts:
	lib/ansible/callbacks.py
	lib/ansible/constants.py
Merge branch 'yum-module' of git://github.com/Tinche/ansible into testing_427
Merge branch 'testing_427' into devel
Merge pull request #2758 from lonerr/service

FreeBSD startup scripts (rc) supports optional arguments.
Changed atomic_replace to atomic_move, now ti DOES move atomically in the last
step
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
Merge branch 'roles_dir_search_order' of git://github.com/mcodd/ansible into devel
Cows don't need to display brackets around strings.
Document variables are reserved.
Update gitignore
use lookup macro rather than with to demonstrate lookup plugins
Document regex patterns.
Trivial lineinfile documentation fix.
Allow playbook tags to be comma seperated strings as well as lists
Add module path library/ if it exists in role directory
add pid to log
Merge pull request #2795 from Tinche/lineinfile-doc

[Trivial][Doc] Lineinfile documentation fix.
Revert "Updated ansible.spec should now work for CentOS 5 and CentOS 6"

make rpm did not work on Fedora 18
This reverts commit ea39454f98f43d5a19d07b4d0110ca0c6fc518be.

Conflicts:
	packaging/rpm/ansible.spec
ansible.spec: update Source0 & Url

The source archive is "tar.gz", not "tar.bz2".
The new home is http://ansible.cc
apt module cache_valid_time documentation fix