From: Martin Zobel-Helas Date: Wed, 16 Mar 2011 20:04:31 +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=65a9612fcfd5ee6b1ae9342da041d286407d4c1e;p=dsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: geo1 on squeeze unger on squeeze rietz on squeeze --- 65a9612fcfd5ee6b1ae9342da041d286407d4c1e