[zarafa/el5: 3/3] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit ad83c56cccf1390eedfdbc27f08637e28280a85a
Merge: d0a1304 d83551f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 24 01:24:43 2013 +0100

    Merge remote branch 'origin/master' into el5

 sources                         |    2 +-
 zarafa-7.1.4-kyotocabinet.patch |  138 +++++++++++++++++++++++++++++
 zarafa-7.1.4-swig20.patch       |   22 +++++
 zarafa.spec                     |  184 +++++++++++++++++++++++----------------
 4 files changed, 268 insertions(+), 78 deletions(-)
---