[clamav/f18: 2/2] Merge branch 'master' into f18

Wed Apr 3 01:13:45 UTC 2013

commit 03abe411106c4587e99a7c10df69ecdfe0d9d909
Merge: 872a09e cd7c063
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Apr 2 20:13:18 2013 -0500

    Merge branch 'master' into f18

 .gitignore         |    1 +
 clamav-update.cron |    2 +-
 clamav.spec        |    5 +++--
 sources            |    4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)
---