Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Mon, 27 Oct 2014 21:04:28 +0000 (22:04 +0100)
committermorsch <andreas.morsch@cern.ch>
Mon, 27 Oct 2014 21:04:28 +0000 (22:04 +0100)

Trivial merge