Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authoralla <Alla.Maevskaya@cern.ch>
Sun, 11 Jan 2015 21:05:01 +0000 (22:05 +0100)
committeralla <Alla.Maevskaya@cern.ch>
Sun, 11 Jan 2015 21:05:01 +0000 (22:05 +0100)
commit18fa2f067e109bb40324d056edb27dde53b56e8d
tree8d7404a0e3206862287dfed2d3e649cab7f95c4a
parentad83768c95bf870ca05d39816aca224d463fe4e1
parent41bd964be4c023798919ca8f40f6762235440391
Merge branch 'master' of https://git.cern.ch/reps/AliRoot

Conflicts:
T0/AliT0RawReader.cxx