[Pkg-puppet-devel] [facter] 08/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 a2d9d4dacd8c07fecb3f9e93a1259d7d4fddd9e5
Merge: dba7269 cad1ba4
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon Mar 10 12:50:09 2014 -0700

    Merge branch 'stable' into facter-2

 lib/facter/util/uptime.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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