jfryman/puppet-nginx — pull request #152 by deric (2013-10-08 08:33:59+00:00)
Title: resolved merging conflict

fixed git merge conflict