projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
20e415d
e18c59d
)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
author
Martin Zobel-Helas
<zobel@debian.org>
Tue, 13 Aug 2013 20:24:16 +0000
(22:24 +0200)
committer
Martin Zobel-Helas
<zobel@debian.org>
Tue, 13 Aug 2013 20:24:16 +0000
(22:24 +0200)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
Add philp
Add philp multipath entry
Trivial merge