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

[Robert Scheck]

commit 400e3e49e0d9ea983fcecffccebed48abf4dcab7
Merge: 8fad6da 28e9711
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Aug 14 01:59:52 2011 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                 |    2 +-
 sources                    |    2 +-
 zarafa-7.0.0-cpp_std.patch |   14 -----
 zarafa.logrotate           |   10 ++++
 zarafa.spec                |  128 ++++++++++++++++----------------------------
 5 files changed, 59 insertions(+), 97 deletions(-)
---