]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 62b2941)
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 2 May 2008 15:14:38 +0000 (17:14 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 2 May 2008 15:14:38 +0000 (17:14 +0200)
Conflicts:

cron.d/100syncarchive_amd64
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
cron.d/100syncarchive_m68k
cron.d/100syncarchive_volatile
templates/html/head.tmpl
templates/html/show.tmpl


No differences found