[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[Bryan Kearney]

The following commit has been merged in the master branch:
commit 751dc7b09f7802189e14e9bb17ab4b01ed31b164
Merge: 9fd1756a8aa56c5d73957a70d5a31a1f6e4223d7 bc8cdb1820d08dafeb5f998393cd3efb1c0571b1
Author: Bryan Kearney <bkearney at redhat.com>
Date:   Tue Oct 28 09:50:42 2008 -0400

    Merge branch 'augeas' of git at github.com:bkearney/puppet into augeas
    
    Conflicts:
    
    	lib/puppet/type/augeas.rb

diff --combined lib/puppet/provider/augeas.rb
index eaaa043,eaaa043..0000000
deleted file mode 100644,100644
--- a/lib/puppet/provider/augeas.rb
+++ /dev/null

-- 
Puppet packaging for Debian