[Pkg-puppet-devel] [facter] 330/352: Merge branch 'pull-594' into stable

[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 8835bc1cd426747e3dbeecf3cf7d01d448ac6c13
Merge: f8c124d 49e94df
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Wed Mar 19 10:41:36 2014 -0700

    Merge branch 'pull-594' into stable

 lib/facter/operatingsystemmajrelease.rb     | 17 +++++++++++++++--
 lib/facter/operatingsystemrelease.rb        |  5 +++++
 spec/unit/operatingsystemmajrelease_spec.rb | 22 ++++++++++++++++++++++
 spec/unit/operatingsystemrelease_spec.rb    |  2 ++
 4 files changed, 44 insertions(+), 2 deletions(-)

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