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

[Robert Scheck]

commit b5f0e1cd017c09ec3f49bc71f28f169a286dfcc5
Merge: 336b71a b2a9f53
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 17 16:18:42 2011 +0100

    Merge remote branch 'origin/master' into el5

 zarafa-7.0.3-boost149.patch |   28 ++++++++++++++++++++++++++++
 zarafa.spec                 |   11 +++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
---