xhh 172da5b2d8 Merge branch 'master' into ruby-binary
Conflicts:
	samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
2016-01-29 12:02:30 +08:00
..