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

[Robert Scheck]

commit 2e23aecced01e474d77c3194595d70c1de087dbb
Merge: 2d99332 815006a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Jul 11 00:38:26 2014 +0200

    Merge remote branch 'origin/master' into el6

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