Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfnoferin <fnoferin@cern.ch>
Wed, 29 Jan 2014 13:46:54 +0000 (14:46 +0100)
committerfnoferin <fnoferin@cern.ch>
Wed, 29 Jan 2014 13:46:54 +0000 (14:46 +0100)

Trivial merge