add the headers
add the headers
Migration of TrackingRegion to comsumes
Correct parameter name
remove include headers
adding missing feature

adding list of files generation needed for Twiki redirect script
Merge pull request #1625 from rovere/DQM-Multithread

Multithreading fixes -- Multithread friendly DQM
Merge pull request #1622 from civanch/muon-bg-study

Simulation fixes -- Added fragments fro neutron background study in muon systems
Merge pull request #1620 from thspeer/consumesJet

Consumes migration -- JetAssociationProducers
Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X
add consumes interface
add consumes interface
add consumes interface
add consumes interface
add consumes interface
add consumes interface
add consumes interface
Merge branch 'CMSSW_7_0_X' of https://github.com/cms-sw/cmssw into consumes_to_cscmonitormodule

Not sure - I a beginner here.
added non-prompt J/psi gen fragment
Merge remote-tracking branch 'official-cmssw/CMSSW_7_0_X' into switchGetterOfProductsToGetByToken.
In the case of conflicts, took changes from official-cmssw/CMSSW_7_0_X

Conflicts:
	HLTrigger/HLTanalyzers/src/EventHeader.cc
	HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc
	HLTrigger/HLTanalyzers/src/HLTBitAnalyzer.cc
	HLTrigger/HLTanalyzers/src/HLTHeavyIon.cc