Merge branch 'master' of https://github.com/aliciakw/clamav-faq

rebase to be in sync with master
Merge branch 'master' of https://github.com/aliciakw/clamav-faq into maruku_is_picky
fix private mirrors
Merge pull request #16 from aliciakw/maruku_is_picky

Maruku is picky