[cyrus-imapd/f17: 2/2] Merge branch 'master' into f17

[Jeroen van Meeuwen]

commit 4c29296664940c28f28c0ced718593a2fb687574
Merge: 2d18222 71ce1d6
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Apr 19 14:45:39 2012 +0100

    Merge branch 'master' into f17

 .gitignore       |    1 +
 cyrus-imapd.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---