[Pkg-puppet-devel] [facter] 139/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 02741a26d5a20b5b34258b00704c768273fc9349
Merge: 1de2d8d 833e019
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Fri Jan 10 09:34:15 2014 -0800

    Merge branch 'stable' into facter-2

 .travis.yml                      |  3 ---
 acceptance/setup/01_TestSetup.rb |  9 ---------
 ext/osx/file_mapping.yaml        |  2 +-
 ext/osx/preflight.erb            | 35 +++++++++++++++++++----------------
 4 files changed, 20 insertions(+), 29 deletions(-)

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