[Pkg-puppet-devel] [facter] 27/46: Merge remote-tracking branch 'upstream/1.7.x' 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 3a4ec613e4ddc8e5991ca589d2bf32725d7190fc
Merge: 3f2e478 8114d9f
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon May 13 15:00:35 2013 -0700

    Merge remote-tracking branch 'upstream/1.7.x' into stable
    
    * upstream/1.7.x:
      (#20301) Handle different error in ruby 1.9
      (maint) Use RSpec 2.9 expectations


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