commit 22f4496df2ebfb0c07a597de98b6d76d49852e06 Merge: 9efc8bf a5b7bfd Author: Nick Bebout <nb at fedoraproject.org> Date: Tue Apr 2 19:58:10 2013 -0500 Merge branch 'el6' into el5 .gitignore | 3 +++ clamav.spec | 12 +++++++----- sources | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) ---