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

[Robert Scheck]

commit 336b71a4af3a078dabb31f4b7585e9046df0d5f8
Merge: e3e8493 e315db3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 20 02:14:16 2011 +0100

    Merge remote branch 'origin/master' into el5

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