]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3a30de d2c37ad)
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 7 Jun 2009 19:56:42 +0000 (21:56 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 7 Jun 2009 19:56:42 +0000 (21:56 +0200)
Conflicts:
config.sh.sed.in
cron.d/100syncarchive_debports
static/index.tmpl
templates/config/mirrors.tmpl

1  2 
bin/parse-contents patch | diff1 | diff2 | blob | history

diff --cc bin/parse-contents
Simple merge