Katello/katello — pull request #3172 by waldenraines (2013-10-14 15:57:51+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
engines/bastion/app/assets/bastion/products/views/products.html
engines/bastion/app/assets/bastion/systems/details/system-subscriptions.controller.js
engines/bastion/app/assets/bastion/systems/systems.controller.js