From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 20 Jul 2011 12:22:33 +0000 (+0200)
Subject: Merge branch 'cyrus-duplicates'
X-Git-Tag: v2.6~58
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=c9125869d9f4ed5b21dfc82711460dbd68901574;p=libi2ncommon

Merge branch 'cyrus-duplicates'
---

c9125869d9f4ed5b21dfc82711460dbd68901574