Katello/katello — pull request #3164 by waldenraines (2013-10-11 13:49:12+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
app/controllers/api/v1/repositories_controller.rb
engines/bastion/app/assets/bastion/systems/details/views/system-info.html