Merge branch '1.4.x' into 14x-merge
authorAshley Penney <ashley.penney@puppetlabs.com>
Wed, 14 May 2014 17:17:19 +0000 (13:17 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Wed, 14 May 2014 17:17:19 +0000 (13:17 -0400)
commit7492f375fe3ea625e71673eaddcd1e11f06aca40
treefa710e86e03f3ed6c0cc76658884b47c2d59ba3c
parenta45c9a8b5831d88b324d2794751fffe66e3d0510
parent84cee791c3a17b70c6ca6c4b64424f51a1aa757f
Merge branch '1.4.x' into 14x-merge