puppetlabs/puppet — pull request #1554 by kbarber (2013-03-25 17:31:36+00:00)
Title: Merge branch 'domcleal-tickets/master/18494-ruby-2.0'

* domcleal-tickets/master/18494-ruby-2.0:
(#18494) Rearrange loop to remove Ruby 2.0 warning
(#18494) Enable Travis building on Ruby 2.0.0
(#18494) Make ActiveRecord-based inventory service unsupported under Ruby 2
(#18494) Force literal strings in test to ASCII-8BIT encoding
(#18494) Remove TypeError handling code used for tests
(#18494) Fix error message test for Ruby 2.0
(#18494) Fix Ruby version number format for Ruby 2.0.0-p-1
(#18494) Change version comparisons to support Ruby 2.0

closes #1470