]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa2e0fe 4aeff51)
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 31 Jan 2009 19:29:32 +0000 (20:29 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 31 Jan 2009 19:29:32 +0000 (20:29 +0100)
Conflicts:
templates/config/mirrors.tmpl

1  2 
conf/apache.conf.sed.in patch | diff1 | diff2 | blob | history

diff --cc conf/apache.conf.sed.in
Simple merge