]> git.deb.at Git - deb/packages.git/commitdiff
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)
Conflicts:
static/index.tmpl
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl


No differences found