projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebc9e50 4a2ae52)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 15 Jul 2009 13:58:01 +0000 (14:58 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 15 Jul 2009 13:58:01 +0000 (14:58 +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.