[Pkg-puppet-devel] [facter] 10/180: 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 718bafe387e7444008421e445b74874df7134d2a
Merge: 39ff1d9 3b824a2
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Tue Mar 11 15:55:53 2014 -0700

    Merge branch 'stable' into facter-2

 lib/facter/util/vlans.rb                        | 2 +-
 spec/fixtures/unit/util/vlans/centos-5-no-vlans | 2 ++
 spec/unit/util/vlans_spec.rb                    | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

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