From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 1 Jan 2010 14:57:27 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=fcbf04aea39b64665b78d2e48b7a38b5f6579514

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet into staging
---

fcbf04aea39b64665b78d2e48b7a38b5f6579514