Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Thu, 8 Jan 2015 08:10:54 +0000 (09:10 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Thu, 8 Jan 2015 08:10:54 +0000 (09:10 +0100)

Trivial merge