projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e117265 a69c275)
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 6 Jul 2009 15:34:58 +0000 (17:34 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 6 Jul 2009 15:34:58 +0000 (17:34 +0200)
commit79b064ca9b0e6a77eed810ce41c66a3d594a0996
tree646aa1e1d9a1418b47551bc45ac16f2d74da93a4tree | snapshot
parente1172653a694832e34a73217501d0e2cb1ac2189commit | diff
parenta69c275c61e895dc5f9497290b7f378356e73398commit | diff
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

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.