Katello/katello — pull request #3257 by waldenraines (2013-10-23 14:21:34+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
app/controllers/api/v1/systems_controller.rb
engines/bastion/app/assets/bastion/products/new/product-form.controller.js