Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcoppedis <Chiara.Oppedisano@to.infn.it>
Wed, 5 Nov 2014 12:38:17 +0000 (13:38 +0100)
committercoppedis <Chiara.Oppedisano@to.infn.it>
Wed, 5 Nov 2014 12:38:17 +0000 (13:38 +0100)

Trivial merge