Katello/katello — pull request #1065 by jlsherrill (2012-11-14 20:59:11+00:00)
Title: Pulpv2 - master merge

seeing what travis will do