Added module apache_httpd (https://github.com/thias/puppet-apache_httpd)
Merge branch 'branch-apache_module'