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

[Robert Scheck]

commit f47a83ef814e11c785ea21f9edf94462b45106d3
Merge: ff0d550 7700964
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 19 23:58:21 2012 +0200

    Merge remote branch 'origin/master' into el5

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