candlepin/candlepin — pull request #305 by dcrissman (2013-06-28 15:37:46+00:00)
Title: merge in changes from master

pull master changes