Merge pull request #361 from mhaskel/1.2.0-prep
authorAshley Penney <ashley.penney@puppetlabs.com>
Wed, 21 May 2014 23:35:59 +0000 (16:35 -0700)
committerAshley Penney <ashley.penney@puppetlabs.com>
Wed, 21 May 2014 23:35:59 +0000 (16:35 -0700)
1.2.0 prep


Trivial merge