]> git.donarmstrong.com Git - dsa-puppet.git/commit
projects / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d6467a 701a84a)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 10 Sep 2011 17:22:26 +0000 (19:22 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 10 Sep 2011 17:22:26 +0000 (19:22 +0200)
commit57b225fc5eb497c88bf8c781e50d4914ff4d721e
tree775831e0287b028767558f7d7bb4f8ad70928353tree | snapshot
parent0d6467aa40b13f9a1f8b1fbfb5483db78cb2183ccommit | diff
parent701a84a3c346ab516e5405b5535b25ed4352f809commit | diff
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:
  sudo for emdebian
  vivaldi → squeeze
  Try something with logrotate on wieck
  82.195.75.81 no longer works as nameserver

Conflicts:
modules/debian-org/misc/local.yaml
modules/debian-org/misc/local.yaml diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.