projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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...
author
Martin Zobel-Helas
<zobel@debian.org>
Sat, 19 Feb 2011 10:01:57 +0000
(11:01 +0100)
committer
Martin 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