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

[Robert Scheck]

commit 02e1ad31b4165c30edbcb1afa32f79055943480d
Merge: 8bdb536 2d71de1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 22 05:49:56 2012 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                  |    2 +-
 sources                     |    2 +-
 zarafa-7.0.3-boost149.patch |   28 ---------
 zarafa-7.0.4-php54.patch    |  130 -------------------------------------------
 zarafa.spec                 |   82 +++++++++++++++------------
 5 files changed, 47 insertions(+), 197 deletions(-)
---