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
Merge pull request #2797 from ciupicri/devel-rpm

Fixed some RPM packaging issues
Spec version should be 1.2
Merge pull request #2794 from stoned/role-library

Add module path library/ if it exists in role directory
Make sure we compare flavor IDs as ints

We were comparing an int to a string and getting things wrong, so
idempotence was lost. This forces the comparison to be int.
Remove errant debugging code

This should have never made it in.
Merge pull request #2799 from j2sol/flavor-int

Fix instance idempotence
fix arguments to isinstance() in env lookup
Merge pull request #2800 from tartansandal/env_bug

fix arguments to isinstance() in env lookup
Upstart, how do I love thee.  Let me count the ways.  0.
Register skipped tasks so we can at least check their changed/not-changed status.
update changelog
Allow modules to be categorized, and also sort them when generating the documentation.
teach plugin loader to find modules in subdirectories
Don't use "finally" here as it's not 2.4 compliant.
Fixed setup module to accomodate venet interfaces (OpenVZ)