Jeff McCune fea0b06bc8 Merge branch '2.2.x' into 2.3.x ... * 2.2.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3 Conflicts: CHANGELOG Modulefile		2012-03-29 15:20:28 -07:00
..
facter	Merge pull request #44 from jeffmccune/ticket/2.3.x/12357_add_puppet_settings_facts	2012-03-06 17:14:35 -08:00
puppet	Merge branch '2.2.x' into 2.3.x	2012-03-29 15:20:28 -07:00