Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorhristov <Peter.Hristov@cern.ch>
Wed, 5 Feb 2014 13:18:29 +0000 (14:18 +0100)
committerhristov <Peter.Hristov@cern.ch>
Wed, 5 Feb 2014 13:18:29 +0000 (14:18 +0100)

Trivial merge