Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sat, 8 Nov 2014 19:20:38 +0000 (20:20 +0100)
committermivanov <marian.ivanov@cern.ch>
Sat, 8 Nov 2014 19:20:38 +0000 (20:20 +0100)
commit9a82a9001483f88b892e7da8f251c0e802615b1c
treeee80ff90e395a93f78fcaef1ebb6481edcf60397
parentef80abfede298c29dbb8120e6678609f033ab6d9
parent5365567c1b588df1c0eb981394b02bcf49777964
Merge branch 'master' into TPCdev

Conflicts:
STEER/ESD/AliESDEvent.h
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDEvent.cxx
STEER/ESD/AliESDEvent.h
STEER/ESD/AliESDHeader.cxx
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.h