From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 4 Mar 2010 10:47:34 +0000 (+0100)
Subject: Merge remote branch 'origin/amavisd-update' into glibc-upgrade
X-Git-Tag: v2.6~112^2~15
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=d5367c2dd8f81d433803c0b19983c25941ba96bd;p=libi2ncommon

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.
---

d5367c2dd8f81d433803c0b19983c25941ba96bd