[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-142-g57ed63b

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 9eb13ac3db327d352929ca16243a4f72496543fb
Merge: 2aad8d2a489debbf8af090a282c752101a194363 11423f8a91ece9fa3c437106cd250b15bd5d4846
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Aug 25 09:23:54 2010 +0200

    Merge branch 'upstream'
    
    Conflicts:
    	ext/puppetlast
    	spec/unit/application/apply_spec.rb


-- 
Puppet packaging for Debian