[clamav/el5: 13/13] Merge remote branch 'origin/el6' into el5

[Robert Scheck]

commit 9efc8bf4894618bd294b919a9b067387c04a3fc0
Merge: 957c5ce 15b6ada
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Sep 27 19:56:07 2012 +0200

    Merge remote branch 'origin/el6' into el5
    
    Conflicts:
    	.gitignore
    	clamav.spec
    	sources

 .gitignore              |   10 +++--
 clamav-milter.sysconfig |    4 ++
 clamav.spec             |   90 ++++++++++++++++------------------------------
 clamd.logrotate         |    8 ++++
 freshclam.cron          |   17 +++++++++
 freshclam.logrotate     |    5 +++
 sources                 |    4 +-
 7 files changed, 73 insertions(+), 65 deletions(-)
---