hunner/puppetlabs-apache — pull request #43 by hunner (2013-04-26 23:09:33+00:00)
Title: Merge branch 'master' into prepare_merge

Brining refactored branch up to date to send PR

Updated to deprecate `purge_vdir` for purging of conf.d on RedHat

Conflicts:
manifests/init.pp
spec/defines/mod_spec.rb
spec/defines/vhost_spec.rb