]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 20 Oct 2007 23:45:19 +0000 (01:45 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 20 Oct 2007 23:45:19 +0000 (01:45 +0200)
commit7fe3c9b50d2de32cf6abd9cb3aa0744d8600aeda
treee646f0a313c00dfa8648721a74c674cc3342a422
parent1ae4a483ac7b5f2fa3323de54ec96732a694e76f
parent3b39a05cdd95fd98b08fc74ec1463f8def465457
Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master

Conflicts:

cron.d/600prepare_newpkg
templates/config.tmpl
templates/html/foot.tmpl
templates/html/head.tmpl
conf/apache.conf.sed.in
config.sh.sed.in
lib/Packages/DoSearchContents.pm
lib/Packages/Search.pm
static/packages.css.sed.in
templates/config.tmpl
templates/html/foot.tmpl
templates/html/head.tmpl