From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 26 Dec 2009 16:58:28 +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=f4702fedb73ca0c0d70cc2054a64c4523d26c781

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

f4702fedb73ca0c0d70cc2054a64c4523d26c781