]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 7 Jun 2009 19:56:42 +0000 (21:56 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 7 Jun 2009 19:56:42 +0000 (21:56 +0200)
commit0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6
tree5e5017d0c9ab7e4723ab647b2ee77417bd576b29
parenta3a30de1bd4be8a1812a7f74df5990da26008446
parentd2c37ad5a233f2026d3309905f6715ec672be45b
Merge branch 'master' into ubuntu-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_debports
static/index.tmpl
templates/config/mirrors.tmpl
bin/parse-contents