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

[Robert Scheck]

commit fbb3b95baf9b884405cd8e498c9b7f602a397800
Merge: e5dd60c 310ac54
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 8 17:37:41 2013 +0100

    Merge remote branch 'origin/master' into el6

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