Merge branch 'cyrus-setacl-bug'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 17 Mar 2011 09:37:34 +0000 (10:37 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 17 Mar 2011 09:37:34 +0000 (10:37 +0100)
commitfccc6470e91df6f46168e96e73f4c7be8c291f41
tree98854806ad434cca39ed19b58389d75ba3ee9ff6
parent49f91b40dabf14305266362abc325ec199744171
Merge branch 'cyrus-setacl-bug'

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