commit d7b1ce8729238f27419fdf29ac603b2c61eb45f4 Merge: 2d413e8 9fa6d10 Author: Robert Scheck <robert at fedoraproject.org> Date: Sat Oct 19 13:55:46 2013 +0200 Merge remote branch 'origin/el6' into el5 clamav.init | 2 +- clamav.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---