cms-sw/cmssw — pull request #963 by ktf (2013-10-01 13:18:06+00:00)
Title: Reco updates -- Backport btagging changes to 62X.

Fix #892 conflict when merging.