Merge remote-tracking branch 'remotes/origin/master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Wed, 23 Apr 2014 14:46:49 +0000 (16:46 +0200)
committermivanov <marian.ivanov@cern.ch>
Wed, 23 Apr 2014 14:46:49 +0000 (16:46 +0200)
commit39396a4b2160db89f647047cb8153b8a13ae48db
treeeb9ae610f7e8673da92cab765f4c8933d4446ba8
parenta480146e5492363ed64f4436ce748290874ccd39
parentef514340c71c2d15a04e931083b8325e3409feb3
Merge remote-tracking branch 'remotes/origin/master' into TPCdev

Conflicts:
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.cxx
STEER/STEERBase/AliExternalTrackParam.cxx
STEER/STEERBase/AliExternalTrackParam.h