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

[Robert Scheck]

commit 2a88c6f82c27aaa9cfee761fa832b6dd4f227f91
Merge: b7bb67e b2a9f53
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 17 16:18:19 2011 +0100

    Merge remote branch 'origin/master' into el6

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