]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master' into ubuntu-master
authorFrank Lichtenheld <djpig@debian.org>
Fri, 30 Oct 2009 10:01:25 +0000 (11:01 +0100)
committerFrank Lichtenheld <djpig@debian.org>
Fri, 30 Oct 2009 10:01:25 +0000 (11:01 +0100)
commit616332d8dd69eb67e61e50cbf531c698af542016
treef065df4ceb592d2ea3f9e30e6edfef3076b80df8
parent748ceddd9cfe7f65f7e349321488be52c11f1e22
parent536628c059f6988d3352cb91a942e2cfd4346a85
Merge commit 'origin/master' into ubuntu-master

Conflicts:
static/index.tmpl
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl
conf/apache.conf.sed.in
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl
templates/html/foot.tmpl
templates/html/show.tmpl