]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 21 Feb 2009 14:23:28 +0000 (15:23 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 21 Feb 2009 14:23:28 +0000 (15:23 +0100)
commit655b2eb3a319370039897127a65666b536af901e
treefd020e00300810b885f80b7e5e2277ae195e4938
parent9786e970292c154845a5f5dbc3086191ea59a6f0
parent593370791356c703ea99794487f5b9da68a61a56
Merge commit 'origin/master'

Conflicts:
config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_m68k
lib/Packages/DoSearchContents.pm
lib/Packages/Search.pm
static/index.tmpl
templates/config/archive_layout.tmpl
bin/parse-packages
lib/Packages/DoShow.pm