]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 16 Feb 2008 00:55:26 +0000 (01:55 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 16 Feb 2008 00:55:26 +0000 (01:55 +0100)
commit4c6c02445d6bd955db66d82946b8c955b1f43615
treeae5c400e62db45bb73266b39bfa22cfba2b2b048
parent3cf32c32f93178b8645cb641b57e24c724e6cc13
parent0599eda304163e667f335b8920b0f3b306e6fb83
Merge branch 'master' into ubuntu-master

Conflicts:

cron.d/100syncarchive
cron.d/300maintainerdb
templates/config.tmpl
templates/config/mirrors.tmpl
templates/config.tmpl