Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Wed, 15 Oct 2014 11:38:13 +0000 (13:38 +0200)
committercholm <Christian.Holm.Christensen@cern.ch>
Wed, 15 Oct 2014 11:38:13 +0000 (13:38 +0200)

Trivial merge