[cyrus-imapd/f18: 4/4] Merge branch 'master' into f18

[Jeroen van Meeuwen]

commit 217f8317f980a6aacfc1e20d3e94ca42abb40ef0
Merge: a5ceaeb d97866d
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sat Dec 1 20:51:05 2012 +0000

    Merge branch 'master' into f18
    
    Conflicts:
    	cyrus-imapd.spec

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