[Pkg-puppet-devel] Merged 0.25.1 into origin/upstream

[Nigel Kersten]

git clone ssh://${ALIOTH_ME}@git.debian.org/git/pkg-puppet/puppet.git
git remote add reductive git://github.com/reductivelabs/puppet.git
git remote update
git checkout -b upstream origin/upstream
git merge 0.25.1 (this is a tag on reductive)
git push origin upstream


This should be the workflow..... comments welcome if people think I've
got it wrong.