Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorhristov <Peter.Hristov@cern.ch>
Tue, 10 Jun 2014 14:39:09 +0000 (16:39 +0200)
committerhristov <Peter.Hristov@cern.ch>
Tue, 10 Jun 2014 14:39:09 +0000 (16:39 +0200)

Trivial merge