puppetlabs/puppet-docs — pull request #290 by laurenrother (2014-03-05 22:45:09+00:00)
Title: Fixes formatting errors

Removes weird merge formatting. Not sure when/how that happened.