Katello/katello — pull request #3276 by waldenraines (2013-10-28 14:55:43+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge 

Conflicts:
engines/bastion/app/assets/bastion/systems/details/views/system-info.html