From: Stephen Gran <steve@lobefin.net>
Date: Sun, 23 May 2010 13:16:01 +0000 (+0000)
Subject: Merge branch 'master' of /srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d078736addc38b1d8f05d6db0b4989d50ba5707f;p=dsa-puppet.git

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

d078736addc38b1d8f05d6db0b4989d50ba5707f