Jeff McCune a8a4f93992 Merge branch '2.1.x' into 2.2.x ... * 2.1.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb		2012-08-20 14:03:48 -07:00
..
functions	Merge branch '2.1.x' into 2.2.x	2012-08-20 14:03:48 -07:00