Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev
authorsgweber <steffen.georg.weber@cern.ch>
Fri, 13 Jun 2014 20:24:35 +0000 (22:24 +0200)
committersgweber <steffen.georg.weber@cern.ch>
Fri, 13 Jun 2014 20:24:35 +0000 (22:24 +0200)

Trivial merge