Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorhristov <Peter.Hristov@cern.ch>
Mon, 10 Feb 2014 12:34:05 +0000 (13:34 +0100)
committerhristov <Peter.Hristov@cern.ch>
Mon, 10 Feb 2014 12:34:05 +0000 (13:34 +0100)

Trivial merge