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

[Robert Scheck]

commit 4187d7dc9761082aa124762526d3523ba49deaa6
Merge: 596b6be 815006a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Jul 11 00:38:57 2014 +0200

    Merge remote branch 'origin/master' into el5

 zarafa-7.1.10-kyotocabinet.patch |   28 ++++++++++++++++++++++++++++
 zarafa-7.1.10-mariadb.patch      |   22 ++++++++++++++++++++++
 zarafa.spec                      |   10 +++++++++-
 3 files changed, 59 insertions(+), 1 deletions(-)
---