Merge branch '4.x'
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:24:02 +0000 (16:24 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 18 Mar 2014 23:24:02 +0000 (16:24 -0700)
commita2f7202ec9f9a338b9cc75d76e2fd764fa8011b8
treecc8ff0f324c8a6d527512bff5021cb25dde9f5ec
parent4a461423ccae90fb594ce2af1456e2d84aa6e00b
parentaedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45
Merge branch '4.x'
CHANGELOG.md