Merge remote branch 'origin/amavisd-update' into glibc-upgrade
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 4 Mar 2010 10:47:34 +0000 (11:47 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 4 Mar 2010 10:47:34 +0000 (11:47 +0100)
commitd5367c2dd8f81d433803c0b19983c25941ba96bd
treebda8f3cd230bcc2de35cf57add1dc74904cbaa5f
parent0bd1e98c45380c137db994e106778c944151226b
parent42cfff480ff1f406f17d8e86e842ad31574d6ee5
Merge remote branch 'origin/amavisd-update' into glibc-upgrade

Conflicts:
generate/generate/amavisd.ag
packages/amavisd-new/amavisd-new-2.3.3-output-msg-status-for-spamfilter-calibration.patch
packages/amavisd-new/amavisd-new.spec
packages/perl-Net-Server/perl-Net-Server.spec
packages/unarj/unarj.spec
spamfilter_calibrator/src/main.cpp

Removed sqlite 3.6.21 from amavisd-update branch
as glibc-upgrade branch already contains 3.6.22.