Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcoppedis <Chiara.Oppedisano@to.infn.it>
Mon, 13 Oct 2014 09:15:28 +0000 (11:15 +0200)
committercoppedis <Chiara.Oppedisano@to.infn.it>
Mon, 13 Oct 2014 09:15:28 +0000 (11:15 +0200)

Trivial merge