]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4702fe 56d919e)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 1 Jan 2010 14:57:27 +0000 (15:57 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 1 Jan 2010 14:57:27 +0000 (15:57 +0100)
1  2 
fileserver.conf patch | diff1 | diff2 | blob | history

diff --cc fileserver.conf
Simple merge
Unnamed repository; edit this file 'description' to name the repository.