Merge remote-tracking branch 'pr/56' into pull-56
authorAdrien Thebo <git@somethingsinistral.net>
Tue, 28 May 2013 18:03:51 +0000 (11:03 -0700)
committerAdrien Thebo <git@somethingsinistral.net>
Tue, 28 May 2013 18:07:41 +0000 (11:07 -0700)
commit0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0
tree88519e78cc056dbdacf059d7f785a2b3f8d76b20
parent9c8c8275abd76878d38a0f6f3af52dc468656283
parent4732676548f91a43bc67ea0b70abdd34cae093c1
Merge remote-tracking branch 'pr/56' into pull-56

Conflicts:
lib/puppet/parser/functions/range.rb
spec/unit/puppet/parser/functions/range_spec.rb
lib/puppet/parser/functions/range.rb
spec/unit/puppet/parser/functions/range_spec.rb