From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 16 Mar 2010 11:46:54 +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/?a=commitdiff_plain;h=436211e11f3c995c3289705c59660c1459f1bf4c;p=dsa-puppet.git

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

436211e11f3c995c3289705c59660c1459f1bf4c