Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev
authorsgorbuno <Sergey.Gorbunov@cern.ch>
Tue, 29 Jul 2014 14:45:13 +0000 (16:45 +0200)
committersgorbuno <Sergey.Gorbunov@cern.ch>
Tue, 29 Jul 2014 14:45:13 +0000 (16:45 +0200)

Trivial merge