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

[Robert Scheck]

commit b7bb67eda614b7a35e7355f803f510edfd88fcd8
Merge: 21938df e315db3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Nov 20 02:13:52 2011 +0100

    Merge remote branch 'origin/master' into el6

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