Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorhristov <Peter.Hristov@cern.ch>
Wed, 22 Oct 2014 12:33:09 +0000 (14:33 +0200)
committerhristov <Peter.Hristov@cern.ch>
Wed, 22 Oct 2014 12:33:09 +0000 (14:33 +0200)

Trivial merge