Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorPietro Antonioli <Pietro.Antonioli@bo.infn.it>
Fri, 10 Jan 2014 14:09:23 +0000 (15:09 +0100)
committerPietro Antonioli <Pietro.Antonioli@bo.infn.it>
Fri, 10 Jan 2014 14:09:23 +0000 (15:09 +0100)

Trivial merge