master
fix HLTrigger/Configuration/python/Tools/confdb.py
fix host names for offline database in the comments
hltGetConfiguration: read a list of files from DAS if the input is in the format dataset:... (73X)
Do modern exceptions after conflicts resolved
remove unneeded import six
Reverting CMSHLT-3820 and HLT menu V1.3
Snapshot of CMSSW_6_2_0_pre8.