Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormbroz <Michal.Broz@cern.ch>
Wed, 17 Dec 2014 20:01:01 +0000 (21:01 +0100)
committermbroz <Michal.Broz@cern.ch>
Wed, 17 Dec 2014 20:01:01 +0000 (21:01 +0100)

Trivial merge