[Pkg-puppet-devel] [facter] 151/352: Merge branch 'stable' into facter-2

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit e4a5a0a1325b07c8b295ce34fa18c4fe12e390ed
Merge: 96904c9 60908eb
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Wed Jan 15 13:22:52 2014 -0800

    Merge branch 'stable' into facter-2

 lib/facter/util/cfpropertylist/lib/rbCFPropertyList.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git