From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 17 Mar 2011 09:37:34 +0000 (+0100)
Subject: Merge branch 'cyrus-setacl-bug'
X-Git-Tag: v2.6~80
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=fccc6470e91df6f46168e96e73f4c7be8c291f41;p=libi2ncommon

Merge branch 'cyrus-setacl-bug'

Conflicts:
	packages/cyrus-imapd/cyrus-imapd-2.3.16-keep-owner-rights.patch
---