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

[Robert Scheck]

commit be0d6a1d709913c57abe0493998c7551b1f51339
Merge: ad83c56 310ac54
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 8 17:38:29 2013 +0100

    Merge remote branch 'origin/master' into el5

 sources                         |    2 +-
 zarafa-7.1.4-kyotocabinet.patch |  138 ---------------------------------------
 zarafa-webaccess.conf           |   16 +++++
 zarafa.spec                     |   78 +++++++++++-----------
 4 files changed, 56 insertions(+), 178 deletions(-)
---