cms-sw/cmssw — pull request #1481 by inugent (2013-11-16 09:27:48+00:00)
Title: patch to resolve conflict

adding patch for average X in Z decays