Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorcholm <Christian.Holm.Christensen@cern.ch>
Tue, 28 Oct 2014 21:14:49 +0000 (22:14 +0100)
committercholm <Christian.Holm.Christensen@cern.ch>
Tue, 28 Oct 2014 21:14:49 +0000 (22:14 +0100)

Trivial merge