[clamav/f17: 3/3] Merge branch 'master' into f17

[Nick Bebout]

commit a90700f25174bca6508a7730a17349e3825e5349
Merge: f78b065 d910062
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon May 13 10:06:45 2013 -0500

    Merge branch 'master' into f17

 .gitignore                                |    2 +
 clamav-update.cron => clamav-update.crond |    0
 clamav.spec                               |   59 +++++++++++++++--------------
 sources                                   |    4 +-
 4 files changed, 34 insertions(+), 31 deletions(-)
---
diff --cc .gitignore
index 3734239,9c5c3ee..4d60b9c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,9 +1,5 @@@
 -/clamav-0.97.6-norar.tar.xz
 -/main-54.cvd
 -/daily-15389.cvd
  /clamav-0.97.7-norar.tar.xz
 -/main.cvd
 -/daily.cvd
 +/main-54.cvd
  /daily-16898.cvd
+ /clamav-0.97.8-norar.tar.xz
+ /daily-17144.cvd