projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 061b70e 0a8f0c4)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 14:01:19 +0000 (15:01 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 14:01:19 +0000 (15:01 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Revert "test template"


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