projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 207db8c 855484d)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 16 Mar 2010 11:46:54 +0000 (12:46 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 16 Mar 2010 11:46:54 +0000 (12:46 +0100)
1  2 
modules/exim/templates/eximconf.erb patch | diff1 | diff2 | blob | history

diff --cc modules/exim/templates/eximconf.erb
Simple merge
Unnamed repository; edit this file 'description' to name the repository.