Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Fri, 20 Jun 2014 18:34:40 +0000 (20:34 +0200)
committermorsch <andreas.morsch@cern.ch>
Fri, 20 Jun 2014 18:34:40 +0000 (20:34 +0200)

Trivial merge