Merge branch 'master' of http://git.cern.ch/pub/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Fri, 13 Feb 2015 15:02:31 +0000 (16:02 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Fri, 13 Feb 2015 15:02:31 +0000 (16:02 +0100)

Trivial merge