Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfnoferin <fnoferin@cern.ch>
Wed, 22 Oct 2014 12:32:24 +0000 (14:32 +0200)
committerfnoferin <fnoferin@cern.ch>
Wed, 22 Oct 2014 12:32:24 +0000 (14:32 +0200)

Trivial merge