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

[Robert Scheck]

commit 15819078336a49316efdbe8289147b04c81a56c0
Merge: 38d6b76 7700964
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 19 23:57:59 2012 +0200

    Merge remote branch 'origin/master' into el6

 sources                    |    2 +-
 zarafa-7.0.8-zlib127.patch |   27 +++++++++++++++++++++++++++
 zarafa.spec                |   11 ++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)
---