]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into archive-master
authorGerfried Fuchs <rhonda@debian.at>
Thu, 12 Aug 2010 21:57:02 +0000 (23:57 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Thu, 12 Aug 2010 21:57:02 +0000 (23:57 +0200)
commitf6000bc63f707c11cbb15433f66b41144c91522e
tree4693e0b1fb4ee55014d6df592eba903156ad3e1d
parenta552dea93aeebaf99671f36c5130494f608e37c4
parentbe928cd791342914b67ccf1a102df2da654e904c
Merge branch 'master' into archive-master

Conflicts:
config.sh.sed.in
templates/config.tmpl
templates/config/mirrors.tmpl
conf/apache.conf.sed.in
config.sh.sed.in
templates/config.tmpl
templates/config/mirrors.tmpl
templates/html/download.tmpl