]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 17 Mar 2011 22:58:44 +0000 (23:58 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 17 Mar 2011 22:58:44 +0000 (23:58 +0100)
commit48005c81d90928a93e1adfed3fa446838a4e49b9
tree24923782a481b260c2e515bcb6a959d932c4e028
parentfed0419765b8d156b8e2bdd47cb176599484edeb
parentc38f1ce16ccfab30eb85e7f0e19f5114e5d043ed
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
modules/debian-org/misc/local.yaml