From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 26 Aug 2010 22:10:54 +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=70a9bda9ef6e5fa2cebded47c59a11a2592c5511

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

70a9bda9ef6e5fa2cebded47c59a11a2592c5511