Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Fri, 20 Feb 2015 12:53:41 +0000 (13:53 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Fri, 20 Feb 2015 12:53:41 +0000 (13:53 +0100)

Trivial merge