1.1.x merged into master#127

Merged

underscorgan merged 5 commits intopuppetlabs:masterfrom

underscorgan:1.1.x-merged-into-master

Sep 26, 2014

Commits on Jul 9, 2014

1.1.2-prep.
Morgan Haskel
committed
Merge pull request #120 from mhaskel/1.1.2-prep
hunner
committed

Commits on Jul 15, 2014

Prepare a 1.1.3 release.
Ashley Penney
committed
Merge pull request #121 from apenney/113-release
cyberious
committed

Commits on Sep 26, 2014

Merge remote-tracking branch 'upstream/1.1.x' into test
Morgan Haskel
committed

⚡