projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0eb25c 4f6cdd5)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 6 Mar 2010 17:36:57 +0000 (18:36 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 6 Mar 2010 17:36:57 +0000 (18:36 +0100)
commitbe6b89c6497aa1a34d3245105f69d675637b2812
treeded766b7e6e892899c8d2b6a66c87ba905a43906tree | snapshot
parentb0eb25c561acdd61c98ac776e0012f718ed56fb6commit | diff
parent4f6cdd5d270f9bf8ac92e0d4217ccf016d35f5f6commit | diff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

Conflicts:
manifests/site.pp
manifests/site.pp diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.