]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 30 Oct 2008 20:05:11 +0000 (21:05 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 30 Oct 2008 20:05:11 +0000 (21:05 +0100)
commitfa9c56ffd5952da110ed11757fa82585f4bcae76
tree52730f31f618708326331b8d67bb2c95bfa97b43
parentb6a76bf5c4b760bb12bc40f1c03dd46808b32c0a
parent13bd5c195c09556542474ba98768934a937daace
Merge commit 'origin/master' into ubuntu-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
cron.d/100syncarchive_volatile
lib/Packages/Search.pm
static/index.tmpl
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl
conf/apache.conf.sed.in
lib/Packages/DoShow.pm
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl
templates/html/show.tmpl