[Pkg-puppet-devel] [facter] 02/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 9cb3862e4b03bae2c6b76190f76f4d2f4a746b14
Merge: 1d9d02c f3e7445
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Tue Mar 4 10:05:05 2014 -0800

    Merge branch 'stable' into facter-2

 lib/facter/util/vlans.rb     | 21 +++++++++------------
 lib/facter/version.rb        |  2 +-
 spec/unit/util/vlans_spec.rb | 33 +++++++++++++++++++++++++++++----
 3 files changed, 39 insertions(+), 17 deletions(-)

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