Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Mon, 1 Dec 2014 15:00:55 +0000 (16:00 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Mon, 1 Dec 2014 15:00:55 +0000 (16:00 +0100)

Trivial merge