cms-sw/cmssw — pull request #2499 by ianna (2014-02-17 17:06:53+00:00)
Title: Shashlik endcap algo

* Integrate Chris' development