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

[Robert Scheck]

commit b4883e8a2e8a13c17e56e83186719e06ce9558f7
Merge: 14138b8 9c2ceb7
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu May 1 00:54:31 2014 +0200

    Merge remote branch 'origin/master' into el6

 sources     |    2 +-
 zarafa.spec |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---