From: Frank Lichtenheld Date: Sun, 7 Jun 2009 19:56:42 +0000 (+0200) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master Conflicts: config.sh.sed.in cron.d/100syncarchive_debports static/index.tmpl templates/config/mirrors.tmpl --- 0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6