From: Martin Zobel-Helas Date: Thu, 17 Mar 2011 22:58:44 +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=48005c81d90928a93e1adfed3fa446838a4e49b9;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: dijkstra on squeeze --- 48005c81d90928a93e1adfed3fa446838a4e49b9