Update master to aliroot master
authorMatthias Richter <Matthias.Richter@scieq.net>
Wed, 4 Mar 2015 11:59:01 +0000 (12:59 +0100)
committerMatthias Richter <Matthias.Richter@scieq.net>
Wed, 4 Mar 2015 11:59:01 +0000 (12:59 +0100)
  commit a0e8f092139214b37beba4f059ab8443c0d25bfb
  Author: morsch <andreas.morsch@cern.ch>
  Date:   Wed Mar 4 12:31:02 2015 +0100


Trivial merge