Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcoppedis <Chiara.Oppedisano@cern.ch>
Tue, 3 Feb 2015 11:39:55 +0000 (12:39 +0100)
committercoppedis <Chiara.Oppedisano@cern.ch>
Tue, 3 Feb 2015 11:39:55 +0000 (12:39 +0100)

Trivial merge