]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master' into archive-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Wed, 29 Oct 2008 11:22:17 +0000 (12:22 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Wed, 29 Oct 2008 11:22:17 +0000 (12:22 +0100)
commit34728f0ea88eef1aab0c5fa1d369e1d6874265d7
tree3cab1fbc138507cc30311a513e0fc0e151c0df01
parent9083dcf3a523120cfb4cd905d26dada501678aea
parent13bd5c195c09556542474ba98768934a937daace
Merge commit 'origin/master' into archive-master

Conflicts:

config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_volatile
static/index.tmpl
cron.d/120synctrans
lib/Packages/Dispatcher.pm