projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4f97bb 2609760)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 27 Jun 2010 14:35:00 +0000 (16:35 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 27 Jun 2010 14:35:00 +0000 (16:35 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  s/ries/FTPHOSTS/


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