Katello/katello — pull request #3330 by waldenraines (2013-11-06 19:06:20+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
app/controllers/users_controller.rb
app/views/common/_fav.html.haml
app/views/organizations/_footer.html.haml