Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Wed, 14 Jan 2015 00:02:11 +0000 (01:02 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Wed, 14 Jan 2015 00:02:11 +0000 (01:02 +0100)

Trivial merge