]> git.deb.at Git - deb/packages.git/commit
Merge remote branch 'origin/debian-master' into archive-master
authorGerfried Fuchs <rhonda@debian.org>
Tue, 11 Jan 2011 07:35:14 +0000 (08:35 +0100)
committerGerfried Fuchs <rhonda@debian.org>
Tue, 11 Jan 2011 07:35:14 +0000 (08:35 +0100)
commitafd01a99cf960a99b2736dedf06887a45883c49f
treea65618ce0d31d75b64b9bd8b1a7fa583de688805
parent5aee756a0f6437b2fbdbf9f8abc4233917fc1842
parenta168232b746fed06714bbb2100be8cf15f032b30
Merge remote branch 'origin/debian-master' into archive-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_installer
setup-site.conf
templates/config.tmpl
templates/config/mirrors.tmpl
templates/html/homepage.tmpl
conf/apache.conf.sed.in
templates/config.tmpl
templates/html/homepage.tmpl