projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 666929f ed99f27)
Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:31:23 +0000 (17:31 +0000)
committerPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:31:23 +0000 (17:31 +0000)
* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  dedicated ganeti ssh chain


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