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

Trivial merge