Katello/katello — pull request #1859 by daviddavis (2013-04-05 15:27:42+00:00)
Title: Merging master to content-filters

Merging changes from master to content-filters. This should help speed up
Travis.