puppetlabs/puppet — pull request #1686 by Sharpie (2013-06-03 17:39:33+00:00)
Title: (#12361) Remove masterlog option

Pull the `masterlog` configuration option as it is unused and causes confusion.
Also, re-word the description of a test in `webrick_spec.rb` as it is testing
the behavior of `masterhttplog` and not `masterlog`.