]> 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>
Mon, 21 Nov 2011 19:37:33 +0000 (20:37 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 21 Nov 2011 19:37:33 +0000 (20:37 +0100)
commit78ad368b11f39122fe7819f7107c02775ea0ea7f
tree530b3dafd36728870802080509d16a20ffa04839
parentadb09492467bf6fc7bcf55e77e255366d179db9d
parent4814c2ec763640fcdf6d94b7472dc6b6662aca68
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:
  klecker does ftp-upcoming
modules/debian-org/misc/local.yaml