Katello/katello — pull request #4000 by waldenraines (2014-04-23 16:21:16+00:00)
Title: Merge remote-tracking branch 'upstream/master' into roles

No conflicts.