Merge
Merge branch 'master' of github:wyrie/puppet-spamassassin