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

[Robert Scheck]

commit 152c78d6160cb88b10a967683444782968bab807
Merge: 16759d5 b2a9f53
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 17 16:17:58 2011 +0100

    Merge remote branch 'origin/master' into f15

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