Katello/katello — pull request #3627 by jlsherrill (2014-01-27 21:51:40+00:00)
Title: removing non-sensical merge within TaskStatus#as_json

this was causing an error during product rendering in the v2
controllers