Katello/katello — pull request #3198 by waldenraines (2013-10-16 19:09:00+00:00)
Title: Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
app/models/organization_destroyer.rb