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

[Robert Scheck]

commit 61af5881ff0f3fdc47fa278f100de7b7ec217192
Merge: 2e23aec 00cb5e0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 25 22:51:29 2014 +0200

    Merge remote branch 'origin/master' into el6

 zarafa.spec |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)
---