Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Mon, 6 Oct 2014 09:48:06 +0000 (11:48 +0200)
committermorsch <andreas.morsch@cern.ch>
Mon, 6 Oct 2014 09:48:06 +0000 (11:48 +0200)

Trivial merge