Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <friederike.bock@cern.ch>
Wed, 19 Nov 2014 12:40:13 +0000 (13:40 +0100)
committerfbock <friederike.bock@cern.ch>
Wed, 19 Nov 2014 12:40:13 +0000 (13:40 +0100)

Trivial merge