Katello/katello — pull request #3135 by waldenraines (2013-10-08 22:24:39+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
engines/bastion/app/assets/bastion/products/views/new-form.html
engines/bastion/app/assets/bastion/products/views/product-details.html
engines/bastion/app/assets/bastion/providers/views/new.html
engines/bastion/app/assets/bastion/repositories/views/new.html