cms-sw/cmssw — pull request #936 by ktf (2013-09-27 08:06:38+00:00)
Title: Consumes migration -- HCAL

This cleans up merge conflicts in #923. The merge conflict is due to the same change being in two different branches with git being confused about it. So this is effectively identical to Salavat pull request.