Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcoppedis <Chiara.Oppedisano@cern.ch>
Mon, 12 Jan 2015 11:43:52 +0000 (12:43 +0100)
committercoppedis <Chiara.Oppedisano@cern.ch>
Mon, 12 Jan 2015 11:43:52 +0000 (12:43 +0100)

Trivial merge