Katello/katello — pull request #2307 by bbuckingham (2013-05-16 04:21:06+00:00)
Title: merging master in to delete-legacy-promotion

There were a hand full of merge conflicts to be resolved. Tested them out manually and with the auto-tests.