From: Frank Lichtenheld Date: Wed, 29 Oct 2008 11:22:17 +0000 (+0100) Subject: Merge commit 'origin/master' into archive-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=34728f0ea88eef1aab0c5fa1d369e1d6874265d7;p=deb%2Fpackages.git 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 --- 34728f0ea88eef1aab0c5fa1d369e1d6874265d7