From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 28 Jul 2010 20:42:32 +0000 (+0200)
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=fc8a2e887766e10b6c33a00c547049d6bf38801c

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

fc8a2e887766e10b6c33a00c547049d6bf38801c