Merge remote-tracking branch 'ansible-origin/devel' into devel

Conflicts:
	library/user
This commit is contained in:
Brendan Beveridge 2012-05-08 10:33:18 +10:00
commit 5df542468d

2
facter
View file

@ -22,4 +22,4 @@
# facter # facter
# ruby-json # ruby-json
/usr/bin/facter --json /usr/bin/facter --json 2>/dev/null