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)
Conflicts:
T0/AliT0RawReader.cxx


Trivial merge