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

[Robert Scheck]

commit 7a506e7ba25539c3cd8e0779262edaeb370c36bb
Merge: 76acd81 94b5b59
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Feb 10 23:35:38 2013 +0100

    Merge remote branch 'origin/master' into el6

 .gitignore                  |    1 +
 sources                     |    2 +-
 zarafa-7.0.8-zlib127.patch  |   27 -----
 zarafa-7.0.9-boost150.patch |  254 -------------------------------------------
 zarafa.spec                 |   29 +++--
 5 files changed, 18 insertions(+), 295 deletions(-)
---