Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev
authorsgweber <steffen.georg.weber@cern.ch>
Sat, 5 Jul 2014 17:31:47 +0000 (19:31 +0200)
committersgweber <steffen.georg.weber@cern.ch>
Sat, 5 Jul 2014 17:31:47 +0000 (19:31 +0200)

Trivial merge