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

[Robert Scheck]

commit a92bdbec8c1c109b96ce0c5ba50bdc59a62ca43f
Merge: 7a506e7 5bfb490
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 3 19:43:21 2013 +0100

    Merge remote branch 'origin/master' into el6

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