]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 18 Oct 2007 21:19:27 +0000 (21:19 +0000)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 18 Oct 2007 21:19:27 +0000 (21:19 +0000)
commit2ad60a1122641f5c264f36a690847b76d38120b3
tree52c89a1b37fa817e6556e9e979f08c7cb840579f
parent934f9f8ca8fff02590783513593a74246a13bd8e
parent0400a01d5bbcf0ca210f15b1423d4e90071fa4fd
Merge commit 'origin/master' into debian-master

Conflicts:

config.sh.sed.in
templates/config.tmpl
config.sh.sed.in
cron.d/050checkinst
lib/Packages/Dispatcher.pm
templates/config.tmpl