Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authoralla <Alla.Maevskaya@cern.ch>
Tue, 20 Jan 2015 15:33:36 +0000 (16:33 +0100)
committeralla <Alla.Maevskaya@cern.ch>
Tue, 20 Jan 2015 15:33:36 +0000 (16:33 +0100)

Trivial merge