cms-sw/cmssw — pull request #7013 by ktf (2014-12-27 12:27:43+00:00)
Title: Do not merge #6896

As requested by Bill, this will avoid auto merging #6896 to CMSSW_7_4_ROOT6_X.