Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorpcrochet <Philippe.Crochet@cern.ch>
Thu, 28 Aug 2014 16:38:31 +0000 (18:38 +0200)
committerpcrochet <Philippe.Crochet@cern.ch>
Thu, 28 Aug 2014 16:38:31 +0000 (18:38 +0200)

Trivial merge