Katello/katello — pull request #3289 by waldenraines (2013-10-30 13:55:46+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge 

Conflicts:
app/controllers/api/v2/repositories_controller.rb
app/models/authorization/repository.rb
engines/bastion/app/assets/bastion/systems/details/views/system-info.html
engines/bastion/app/assets/bastion/systems/details/views/system-subscriptions.html