projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccbbcfd 6a9cfcf)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 00:59:59 +0000 (01:59 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 00:59:59 +0000 (01:59 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  cleanup a bit

1  2 
modules/ferm/files/defs.conf patch | diff1 | diff2 | blob | history

diff --cc modules/ferm/files/defs.conf
Simple merge
Unnamed repository; edit this file 'description' to name the repository.