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

Trivial merge