Katello/katello — pull request #1388 by parthaa (2013-01-12 00:33:47+00:00)
Title: Mergingn Pulp V2 to Content Views

Non VCR conflicts fixed

src/Gemfile
src/app/models/repository.rb

Rest same as merge source. All VCR yml files were regenerated