Merge pull request #196 from hunner/release_1.1.0
authorMorgan Haskel <morgan@puppetlabs.com>
Tue, 15 Jul 2014 00:39:49 +0000 (20:39 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Tue, 15 Jul 2014 00:39:49 +0000 (20:39 -0400)
Release 1.1.0


Trivial merge