Merge pull request #316 from cmurphy/master
authorAshley Penney <ashley.penney@puppetlabs.com>
Thu, 26 Jun 2014 17:53:18 +0000 (13:53 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Thu, 26 Jun 2014 17:53:18 +0000 (13:53 -0400)
Start synchronizing module files


Trivial merge