]> 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>
Mon, 18 Jun 2007 21:03:48 +0000 (23:03 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Mon, 18 Jun 2007 21:03:48 +0000 (23:03 +0200)
commit55214d2626f5e4edcaab71bf47ebf3285a1a6d94
tree3022789ede241a92eda0a714669c680579c12fb6
parentd2feffced1b7f39f2e67fdd736d2cfbcf84b9e45
parentffbc4361c427cc0c4181b1801037caced97cf33b
Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master

Conflicts:

config.sh.sed.in
templates/html/head.tmpl
config.sh.sed.in
lib/Packages/Search.pm
templates/config.tmpl
templates/html/head.tmpl