]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7b1400 6986d1b)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Feb 2011 10:01:57 +0000 (11:01 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Feb 2011 10:01:57 +0000 (11:01 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  samhain ignore /etc/apache2/sites-available/www.debian.org
  abel and alwyn run tftpd


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.