xMerge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Thu, 13 Nov 2014 14:47:21 +0000 (15:47 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Thu, 13 Nov 2014 14:47:21 +0000 (15:47 +0100)

Trivial merge