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

[Robert Scheck]

commit d0a1304402566dffb7c135883813cebdb95678f2
Merge: 28922aa 5bfb490
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 3 19:43:46 2013 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore  |    3 +--
 sources     |    2 +-
 zarafa.spec |    7 +++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
---