Katello/katello — pull request #2701 by waldenraines (2013-07-30 20:13:37+00:00)
Title:     Merge branch 'master' of https://github.com/Katello/katello into bastion-merge

Conflicts:
app/assets/stylesheets/widgets/nutupane.scss
app/views/systems/index_nutupane.html.haml